Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e34640e2 authored by Le Ma's avatar Le Ma Committed by Alex Deucher
Browse files

drm/amdgpu/powerplay: update Arcturus smu version in new place 



Follow patch below:
    drm/amd/powerplay: re-define smu interface version for smu v11

Signed-off-by: default avatarLe Ma <le.ma@amd.com>
Reviewed-by: default avatarKevin Wang <kevin1.wang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a840159c

drivers/gpu/drm/amd/powerplay/arcturus_ppt.c

+0 −1
Original line number Diff line number Diff line
@@ -1918,6 +1918,5 @@ void arcturus_set_ppt_funcs(struct smu_context *smu) 
	struct smu_table_context *smu_table = &smu->smu_table;



	smu->ppt_funcs = &arcturus_ppt_funcs;

	smu->smc_if_version = SMU11_DRIVER_IF_VERSION;

	smu_table->table_count = TABLE_COUNT;

}

drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_arcturus.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
// *** IMPORTANT ***

// SMU TEAM: Always increment the interface version if

// any structure is changed in this file

#define SMU11_DRIVER_IF_VERSION 0x08

//#define SMU11_DRIVER_IF_VERSION 0x08



#define PPTABLE_ARCTURUS_SMU_VERSION 4

drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 


#define SMU11_DRIVER_IF_VERSION_INV 0xFFFFFFFF

#define SMU11_DRIVER_IF_VERSION_VG20 0x13

#define SMU11_DRIVER_IF_VERSION_ARCT 0x08

#define SMU11_DRIVER_IF_VERSION_NV10 0x33

#define SMU11_DRIVER_IF_VERSION_NV14 0x34

drivers/gpu/drm/amd/powerplay/smu_v11_0.c

+3 −0
Original line number Diff line number Diff line
@@ -278,6 +278,9 @@ static int smu_v11_0_check_fw_version(struct smu_context *smu) 
	case CHIP_VEGA20:

		smu->smc_if_version = SMU11_DRIVER_IF_VERSION_VG20;

		break;

	case CHIP_ARCTURUS:

		smu->smc_if_version = SMU11_DRIVER_IF_VERSION_ARCT;

		break;

	case CHIP_NAVI10:

		smu->smc_if_version = SMU11_DRIVER_IF_VERSION_NV10;

		break;