diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3363-drm-amdgpu-powerplay-update-Arcturus-smu-version-in-.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3363-drm-amdgpu-powerplay-update-Arcturus-smu-version-in-.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3363-drm-amdgpu-powerplay-update-Arcturus-smu-version-in-.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3363-drm-amdgpu-powerplay-update-Arcturus-smu-version-in-.patch new file mode 100644 index 00000000..6cbd97e4 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3363-drm-amdgpu-powerplay-update-Arcturus-smu-version-in-.patch @@ -0,0 +1,72 @@ +From 68bdf62105778266b6f576304531ecf4e7e07a31 Mon Sep 17 00:00:00 2001 +From: Le Ma <le.ma@amd.com> +Date: Fri, 9 Aug 2019 15:44:22 +0800 +Subject: [PATCH 3363/4256] drm/amdgpu/powerplay: update Arcturus smu version + in new place + +Follow patch below: + drm/amd/powerplay: re-define smu interface version for smu v11 + +Change-Id: Id78651209adc7a094f4c19ba965dcded37dd3ba7 +Signed-off-by: Le Ma <le.ma@amd.com> +Reviewed-by: Kevin Wang <kevin1.wang@amd.com> +--- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 1 - + drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_arcturus.h | 2 +- + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 1 + + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 3 +++ + 4 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +index 52e6214c3f22..6aa135938e00 100644 +--- 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 c7a7953b52b7..b99e98c40720 100644 +--- 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 97605e963c2b..3e571016df80 100644 +--- 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 0x33 + +diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c +index 071a63dd4ba2..3a081acdf1a8 100644 +--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c ++++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c +@@ -275,6 +275,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; +-- +2.17.1 + |