diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1884-drm-amd-powerplay-delete-SMU_WRITE_INDIRECT_FIELD.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1884-drm-amd-powerplay-delete-SMU_WRITE_INDIRECT_FIELD.patch | 105 |
1 files changed, 105 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1884-drm-amd-powerplay-delete-SMU_WRITE_INDIRECT_FIELD.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1884-drm-amd-powerplay-delete-SMU_WRITE_INDIRECT_FIELD.patch new file mode 100644 index 00000000..b293d2a2 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1884-drm-amd-powerplay-delete-SMU_WRITE_INDIRECT_FIELD.patch @@ -0,0 +1,105 @@ +From b16f1b2c4e5ad9ee2727d6e0035e0615700680c0 Mon Sep 17 00:00:00 2001 +From: Rex Zhu <Rex.Zhu@amd.com> +Date: Wed, 20 Sep 2017 17:17:08 +0800 +Subject: [PATCH 1884/4131] drm/amd/powerplay: delete SMU_WRITE_INDIRECT_FIELD + +the macro is as same as PHM_WRITE_INDIRECT_FIELD + +Change-Id: I973752514a9b85da067700a76f248535fa7ca708 +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 | 15 --------------- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c | 4 ++-- + drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 8 ++++---- + 3 files changed, 6 insertions(+), 21 deletions(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/inc/smumgr.h b/drivers/gpu/drm/amd/powerplay/inc/smumgr.h +index 75ba6eb..10d7457 100644 +--- a/drivers/gpu/drm/amd/powerplay/inc/smumgr.h ++++ b/drivers/gpu/drm/amd/powerplay/inc/smumgr.h +@@ -179,11 +179,6 @@ extern bool smum_is_hw_avfs_present(struct pp_hwmgr *hwmgr); + SMUM_GET_FIELD(cgs_read_ind_register(device, port, ix##reg), \ + reg, field) + +- +- +- +- +- + /*Operations on named fields.*/ + + #define SMUM_READ_VFPF_INDIRECT_FIELD(device, port, reg, field) \ +@@ -199,14 +194,4 @@ extern bool smum_is_hw_avfs_present(struct pp_hwmgr *hwmgr); + SMUM_SET_FIELD(cgs_read_ind_register(device, port, ix##reg), \ + reg, field, fieldval)) + +- +-#define SMUM_WRITE_INDIRECT_FIELD(device, port, reg, field, fieldval) \ +- cgs_write_ind_register(device, port, ix##reg, \ +- SMUM_SET_FIELD(cgs_read_ind_register(device, port, ix##reg), \ +- reg, field, fieldval)) +- +- +- +- +- + #endif +diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c +index 5ae9a6e..bbb85ad 100644 +--- a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c ++++ b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c +@@ -1933,9 +1933,9 @@ static int ci_start_smc(struct pp_hwmgr *hwmgr) + ci_program_jump_on_start(hwmgr); + + /* enable smc clock */ +- SMUM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, SMC_SYSCON_CLOCK_CNTL_0, ck_disable, 0); ++ PHM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, SMC_SYSCON_CLOCK_CNTL_0, ck_disable, 0); + +- SMUM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, SMC_SYSCON_RESET_CNTL, rst_reg, 0); ++ 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, + INTERRUPTS_ENABLED, 1); +diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c +index 3a134ea..fe57335 100644 +--- a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c ++++ b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c +@@ -41,7 +41,7 @@ + + static int iceland_start_smc(struct pp_hwmgr *hwmgr) + { +- SMUM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, ++ PHM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, + SMC_SYSCON_RESET_CNTL, rst_reg, 0); + + return 0; +@@ -49,7 +49,7 @@ static int iceland_start_smc(struct pp_hwmgr *hwmgr) + + static void iceland_reset_smc(struct pp_hwmgr *hwmgr) + { +- SMUM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, ++ PHM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, + SMC_SYSCON_RESET_CNTL, + rst_reg, 1); + } +@@ -57,14 +57,14 @@ static void iceland_reset_smc(struct pp_hwmgr *hwmgr) + + static void iceland_stop_smc_clock(struct pp_hwmgr *hwmgr) + { +- SMUM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, ++ PHM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, + SMC_SYSCON_CLOCK_CNTL_0, + ck_disable, 1); + } + + static void iceland_start_smc_clock(struct pp_hwmgr *hwmgr) + { +- SMUM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, ++ PHM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, + SMC_SYSCON_CLOCK_CNTL_0, + ck_disable, 0); + } +-- +2.7.4 + |