diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1890-drm-amd-powerplay-delete-SMUM_WAIT_INDIRECT_FIELD.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1890-drm-amd-powerplay-delete-SMUM_WAIT_INDIRECT_FIELD.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1890-drm-amd-powerplay-delete-SMUM_WAIT_INDIRECT_FIELD.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1890-drm-amd-powerplay-delete-SMUM_WAIT_INDIRECT_FIELD.patch new file mode 100644 index 00000000..781d9d36 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1890-drm-amd-powerplay-delete-SMUM_WAIT_INDIRECT_FIELD.patch @@ -0,0 +1,68 @@ +From e4d9ef6e3446bb917bdee4928336da2d13961114 Mon Sep 17 00:00:00 2001 +From: Rex Zhu <Rex.Zhu@amd.com> +Date: Wed, 20 Sep 2017 17:31:07 +0800 +Subject: [PATCH 1890/4131] drm/amd/powerplay: delete SMUM_WAIT_INDIRECT_FIELD + +repeated defining in hwmgr.h +use PHM_WAIT_INDIRECT_FIELD instand. + +Change-Id: I848bb0599b73a13bdb0858b6d6eae255cf4bd1a2 +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 | 11 ----------- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c | 2 +- + drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 2 +- + 3 files changed, 2 insertions(+), 13 deletions(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/inc/smumgr.h b/drivers/gpu/drm/amd/powerplay/inc/smumgr.h +index ebe988b..cc67d225 100644 +--- a/drivers/gpu/drm/amd/powerplay/inc/smumgr.h ++++ b/drivers/gpu/drm/amd/powerplay/inc/smumgr.h +@@ -151,17 +151,6 @@ extern bool smum_is_hw_avfs_present(struct pp_hwmgr *hwmgr); + + #define SMUM_FIELD_MASK(reg, field) reg##__##field##_MASK + +-#define SMUM_WAIT_INDIRECT_REGISTER_GIVEN_INDEX(hwmgr, \ +- port, index, value, mask) \ +- smum_wait_on_indirect_register(hwmgr, \ +- mm##port##_INDEX, index, value, mask) +- +-#define SMUM_WAIT_INDIRECT_REGISTER(hwmgr, port, reg, value, mask) \ +- SMUM_WAIT_INDIRECT_REGISTER_GIVEN_INDEX(hwmgr, port, ix##reg, value, mask) +- +-#define SMUM_WAIT_INDIRECT_FIELD(hwmgr, port, reg, field, fieldval) \ +- SMUM_WAIT_INDIRECT_REGISTER(hwmgr, port, reg, (fieldval) << SMUM_FIELD_SHIFT(reg, field), \ +- SMUM_FIELD_MASK(reg, field) ) + + #define SMUM_GET_FIELD(value, reg, field) \ + (((value) & SMUM_FIELD_MASK(reg, field)) \ +diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c +index b922de5..7709f62 100644 +--- a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c ++++ b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c +@@ -1937,7 +1937,7 @@ static int ci_start_smc(struct pp_hwmgr *hwmgr) + + PHM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, SMC_SYSCON_RESET_CNTL, rst_reg, 0); + +- SMUM_WAIT_INDIRECT_FIELD(hwmgr, SMC_IND, FIRMWARE_FLAGS, ++ PHM_WAIT_INDIRECT_FIELD(hwmgr, SMC_IND, FIRMWARE_FLAGS, + INTERRUPTS_ENABLED, 1); + + return 0; +diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c +index b729a39..78aa112 100644 +--- a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c ++++ b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c +@@ -80,7 +80,7 @@ static int iceland_smu_start_smc(struct pp_hwmgr *hwmgr) + /* de-assert reset */ + iceland_start_smc(hwmgr); + +- SMUM_WAIT_INDIRECT_FIELD(hwmgr, SMC_IND, FIRMWARE_FLAGS, ++ PHM_WAIT_INDIRECT_FIELD(hwmgr, SMC_IND, FIRMWARE_FLAGS, + INTERRUPTS_ENABLED, 1); + + return 0; +-- +2.7.4 + |