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: Le Ma <le.ma@amd.com>
Reviewed-by: Kevin Wang <kevin1.wang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
index cff3777ae5aa72fd32016f45ef9365fb59147aff..e6fcbdffe458c221bddacf6cc822adf2996222dc 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
+++ b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
@@ -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;
 }

diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_arcturus.h b/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_arcturus.h
index c7a7953b52b7c9170d197ef151f9232565b8a23b..b99e98c407206156628d8b98049fef0fead16abe 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_arcturus.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_arcturus.h
@@ -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
 

diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h b/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h
index ee8542dfd46a104ddc7778a1e09fcd30d54d8b1e..acbb83d179be1b3e50fd2b15c4e9e889b95423e1 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h
@@ -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
 

diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
index 1090a831bd68d03772bd37c47efe5c4111134277..8bbcf034799c5575a9c976c95576f81e0cd8c104 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
+++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
@@ -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;