diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1878-drm-amd-powerplay-use-SMU_IND_INDEX-DATA_11-pair-in-.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1878-drm-amd-powerplay-use-SMU_IND_INDEX-DATA_11-pair-in-.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1878-drm-amd-powerplay-use-SMU_IND_INDEX-DATA_11-pair-in-.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1878-drm-amd-powerplay-use-SMU_IND_INDEX-DATA_11-pair-in-.patch new file mode 100644 index 00000000..279a4d50 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1878-drm-amd-powerplay-use-SMU_IND_INDEX-DATA_11-pair-in-.patch @@ -0,0 +1,49 @@ +From a629cc9bdf02eb519872549f2fec60f2cac18ce7 Mon Sep 17 00:00:00 2001 +From: Rex Zhu <Rex.Zhu@amd.com> +Date: Wed, 20 Sep 2017 16:49:29 +0800 +Subject: [PATCH 1878/4131] drm/amd/powerplay: use SMU_IND_INDEX/DATA_11 pair + in VFPF macros to support virtualization + +Change-Id: I0940e40ed8ea7b3b44eb9b8b5dcd5e03be7e28cc +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> +--- + drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 4 ++-- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/inc/smumgr.h b/drivers/gpu/drm/amd/powerplay/inc/smumgr.h +index 8bdffaa..54b151b 100644 +--- a/drivers/gpu/drm/amd/powerplay/inc/smumgr.h ++++ b/drivers/gpu/drm/amd/powerplay/inc/smumgr.h +@@ -195,12 +195,12 @@ extern bool smum_is_hw_avfs_present(struct pp_hwmgr *hwmgr); + #define SMUM_WAIT_VFPF_INDIRECT_REGISTER_GIVEN_INDEX(hwmgr, \ + port, index, value, mask) \ + smum_wait_on_indirect_register(hwmgr, \ +- mm##port##_INDEX_0, index, value, mask) ++ mm##port##_INDEX_11, index, value, mask) + + #define SMUM_WAIT_VFPF_INDIRECT_REGISTER_UNEQUAL_GIVEN_INDEX(hwmgr, \ + port, index, value, mask) \ + smum_wait_for_indirect_register_unequal(hwmgr, \ +- mm##port##_INDEX_0, index, value, mask) ++ mm##port##_INDEX_11, index, value, mask) + + + #define SMUM_WAIT_VFPF_INDIRECT_REGISTER(hwmgr, port, reg, value, mask) \ +diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c +index 87c8d9e..b28e4e9 100644 +--- a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c ++++ b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c +@@ -2344,7 +2344,7 @@ static int ci_upload_firmware(struct pp_hwmgr *hwmgr) + pr_info("smc is running, no need to load smc firmware\n"); + return 0; + } +- SMUM_WAIT_VFPF_INDIRECT_FIELD(hwmgr, SMC_IND, RCU_UC_EVENTS, ++ PHM_WAIT_INDIRECT_FIELD(hwmgr, SMC_IND, RCU_UC_EVENTS, + boot_seq_done, 1); + PHM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, SMC_SYSCON_MISC_CNTL, + pre_fetcher_en, 1); +-- +2.7.4 + |