the smumgr layer is redundant in powerplay. so delete struct smumgr, move smu callback functions and backend data to hwmgr. the macros SMUM_* in smumgr.h is functionally repeated with macros PHM_* in hwmgr.h, and the macros is irrelated to smu. so delete the macros in smumgr.h Rex Zhu (18): drm/amd/powerplay: refine interface in struct pp_smumgr_func drm/amd/powerplay: delete dead code in hwmgr.h drm/amd/powerplay: refine powerplay code. drm/amd/powerplay: use SMU_IND_INDEX/DATA_11 pair in VFPF macros to support virtualization drm/amd/powerpolay: add new helper functions in hwmgr.h drm/amd/powerplay: move macros to hwmgr.h drm/amd/powerplay: move macros to hwmgr.h drm/amd/powerplay: move macros to hwmgr.h drm/amd/powerplay: delete SMU_WRITE_INDIRECT_FIELD drm/amd/powerplay: delete SMUM_WRITE_FIELD drm/amd/powerplay: delete SMUM_WRITE_VFPF_INDIRECT_FIELD drm/amd/powerplay: delete PHM_READ_VFPF_INDIRECT_FIELD drm/amd/powerplay: delete SMUM_SET_FIELD drm/amd/powerplay: delete SMUM_READ_FIELD drm/amd/powerplay: move macros to hwmgr.h drm/amd/powerplay: delete SMUM_WAIT_INDIRECT_FIELD drm/amd/powerplay: delete SMUM_FIELD_MASK drm/amd/powerplay: delete dead code in smumgr drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 60 ++-- .../drm/amd/powerplay/hwmgr/cz_clockpowergating.c | 8 +- drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 90 +++--- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 63 ++++- drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c | 26 +- .../amd/powerplay/hwmgr/smu7_clockpowergating.c | 60 ++-- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 139 +++++----- .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 26 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c | 12 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 148 +++++----- .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 18 +- .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 16 +- drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 113 +++++++- drivers/gpu/drm/amd/powerplay/inc/pp_instance.h | 2 - drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 202 +------------- drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c | 186 ++++++------- drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.h | 4 +- drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 14 +- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 308 ++++++++++----------- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 109 ++++---- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 130 ++++----- drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 99 ++++--- .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 76 ++--- .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 142 +++++----- .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 126 ++++----- drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c | 130 ++++----- drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.h | 8 +- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 213 +++++++------- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h | 36 +-- drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 256 ++++------------- drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c | 124 ++++----- .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 64 ++--- .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 194 ++++++------- .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h | 16 +- 34 files changed, 1493 insertions(+), 1725 deletions(-) -- 1.9.1