drm/amd/display: Simplify register offsets

[Why]
Runtime initialization of register addresses define
duplicate register offsets in resource file, and makes
register offsets in sub-block defined for compile
time initialization obsolete.

[How]
Remove obsolete sub block register offsets that is
no longer referenced.

Reviewed-by: Martin Leung <Martin.Leung@amd.com>
Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: Chris Park <chris.park@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.h b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.h
index 1c46fad0977bf34d402488a55d373358a01f49eb..271c163e4844f960f4aab9d6d8f4615cf7165fc9 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.h
+++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.h
@@ -31,42 +31,6 @@
 #define DCCG_SFII(block, reg_name, field_prefix, field_name, inst, post_fix)\
        .field_prefix ## _ ## field_name[inst] = block ## inst ## _ ## reg_name ## __ ## field_prefix ## inst ## _ ## field_name ## post_fix
 
-
-#define DCCG_REG_LIST_DCN32() \
-       SR(DPPCLK_DTO_CTRL),\
-       DCCG_SRII(DTO_PARAM, DPPCLK, 0),\
-       DCCG_SRII(DTO_PARAM, DPPCLK, 1),\
-       DCCG_SRII(DTO_PARAM, DPPCLK, 2),\
-       DCCG_SRII(DTO_PARAM, DPPCLK, 3),\
-       DCCG_SRII(CLOCK_CNTL, HDMICHARCLK, 0),\
-       SR(PHYASYMCLK_CLOCK_CNTL),\
-       SR(PHYBSYMCLK_CLOCK_CNTL),\
-       SR(PHYCSYMCLK_CLOCK_CNTL),\
-       SR(PHYDSYMCLK_CLOCK_CNTL),\
-       SR(PHYESYMCLK_CLOCK_CNTL),\
-       SR(DPSTREAMCLK_CNTL),\
-       SR(HDMISTREAMCLK_CNTL),\
-       SR(SYMCLK32_SE_CNTL),\
-       SR(SYMCLK32_LE_CNTL),\
-       DCCG_SRII(PIXEL_RATE_CNTL, OTG, 0),\
-       DCCG_SRII(PIXEL_RATE_CNTL, OTG, 1),\
-       DCCG_SRII(PIXEL_RATE_CNTL, OTG, 2),\
-       DCCG_SRII(PIXEL_RATE_CNTL, OTG, 3),\
-       DCCG_SRII(MODULO, DTBCLK_DTO, 0),\
-       DCCG_SRII(MODULO, DTBCLK_DTO, 1),\
-       DCCG_SRII(MODULO, DTBCLK_DTO, 2),\
-       DCCG_SRII(MODULO, DTBCLK_DTO, 3),\
-       DCCG_SRII(PHASE, DTBCLK_DTO, 0),\
-       DCCG_SRII(PHASE, DTBCLK_DTO, 1),\
-       DCCG_SRII(PHASE, DTBCLK_DTO, 2),\
-       DCCG_SRII(PHASE, DTBCLK_DTO, 3),\
-       SR(DCCG_AUDIO_DTBCLK_DTO_MODULO),\
-       SR(DCCG_AUDIO_DTBCLK_DTO_PHASE),\
-       SR(OTG_PIXEL_RATE_DIV),\
-       SR(DTBCLK_P_CNTL),\
-       SR(DCCG_AUDIO_DTO_SOURCE)
-
-
 #define DCCG_MASK_SH_LIST_DCN32(mask_sh) \
        DCCG_SFI(DPPCLK_DTO_CTRL, DTO_ENABLE, DPPCLK, 0, mask_sh),\
        DCCG_SFI(DPPCLK_DTO_CTRL, DTO_DB_EN, DPPCLK, 0, mask_sh),\

diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_stream_encoder.h b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_stream_encoder.h
index ecd041a446d2c9489dbbc2bab55a3249094f6357..875b1cd46056ba4249d15d5fac1a34b4bbb9df4f 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_stream_encoder.h
+++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_stream_encoder.h
@@ -31,70 +31,6 @@
 #include "stream_encoder.h"
 #include "dcn20/dcn20_stream_encoder.h"
 
-#define SE_DCN32_REG_LIST(id)\
-       SRI(AFMT_CNTL, DIG, id), \
-       SRI(DIG_FE_CNTL, DIG, id), \
-       SRI(HDMI_CONTROL, DIG, id), \
-       SRI(HDMI_DB_CONTROL, DIG, id), \
-       SRI(HDMI_GC, DIG, id), \
-       SRI(HDMI_GENERIC_PACKET_CONTROL0, DIG, id), \
-       SRI(HDMI_GENERIC_PACKET_CONTROL1, DIG, id), \
-       SRI(HDMI_GENERIC_PACKET_CONTROL2, DIG, id), \
-       SRI(HDMI_GENERIC_PACKET_CONTROL3, DIG, id), \
-       SRI(HDMI_GENERIC_PACKET_CONTROL4, DIG, id), \
-       SRI(HDMI_GENERIC_PACKET_CONTROL5, DIG, id), \
-       SRI(HDMI_GENERIC_PACKET_CONTROL6, DIG, id), \
-       SRI(HDMI_GENERIC_PACKET_CONTROL7, DIG, id), \
-       SRI(HDMI_GENERIC_PACKET_CONTROL8, DIG, id), \
-       SRI(HDMI_GENERIC_PACKET_CONTROL9, DIG, id), \
-       SRI(HDMI_GENERIC_PACKET_CONTROL10, DIG, id), \
-       SRI(HDMI_INFOFRAME_CONTROL0, DIG, id), \
-       SRI(HDMI_INFOFRAME_CONTROL1, DIG, id), \
-       SRI(HDMI_VBI_PACKET_CONTROL, DIG, id), \
-       SRI(HDMI_AUDIO_PACKET_CONTROL, DIG, id),\
-       SRI(HDMI_ACR_PACKET_CONTROL, DIG, id),\
-       SRI(HDMI_ACR_32_0, DIG, id),\
-       SRI(HDMI_ACR_32_1, DIG, id),\
-       SRI(HDMI_ACR_44_0, DIG, id),\
-       SRI(HDMI_ACR_44_1, DIG, id),\
-       SRI(HDMI_ACR_48_0, DIG, id),\
-       SRI(HDMI_ACR_48_1, DIG, id),\
-       SRI(DP_DB_CNTL, DP, id), \
-       SRI(DP_MSA_MISC, DP, id), \
-       SRI(DP_MSA_VBID_MISC, DP, id), \
-       SRI(DP_MSA_COLORIMETRY, DP, id), \
-       SRI(DP_MSA_TIMING_PARAM1, DP, id), \
-       SRI(DP_MSA_TIMING_PARAM2, DP, id), \
-       SRI(DP_MSA_TIMING_PARAM3, DP, id), \
-       SRI(DP_MSA_TIMING_PARAM4, DP, id), \
-       SRI(DP_MSE_RATE_CNTL, DP, id), \
-       SRI(DP_MSE_RATE_UPDATE, DP, id), \
-       SRI(DP_PIXEL_FORMAT, DP, id), \
-       SRI(DP_SEC_CNTL, DP, id), \
-       SRI(DP_SEC_CNTL1, DP, id), \
-       SRI(DP_SEC_CNTL2, DP, id), \
-       SRI(DP_SEC_CNTL5, DP, id), \
-       SRI(DP_SEC_CNTL6, DP, id), \
-       SRI(DP_STEER_FIFO, DP, id), \
-       SRI(DP_VID_M, DP, id), \
-       SRI(DP_VID_N, DP, id), \
-       SRI(DP_VID_STREAM_CNTL, DP, id), \
-       SRI(DP_VID_TIMING, DP, id), \
-       SRI(DP_SEC_AUD_N, DP, id), \
-       SRI(DP_SEC_TIMESTAMP, DP, id), \
-       SRI(DP_DSC_CNTL, DP, id), \
-       SRI(DP_SEC_METADATA_TRANSMISSION, DP, id), \
-       SRI(HDMI_METADATA_PACKET_CONTROL, DIG, id), \
-       SRI(DP_SEC_FRAMING4, DP, id), \
-       SRI(DP_GSP11_CNTL, DP, id), \
-       SRI(DME_CONTROL, DME, id),\
-       SRI(DP_SEC_METADATA_TRANSMISSION, DP, id), \
-       SRI(HDMI_METADATA_PACKET_CONTROL, DIG, id), \
-       SRI(DIG_FE_CNTL, DIG, id), \
-       SRI(DIG_CLOCK_PATTERN, DIG, id), \
-       SRI(DIG_FIFO_CTRL0, DIG, id)
-
-
 #define SE_COMMON_MASK_SH_LIST_DCN32(mask_sh)\
        SE_SF(DP0_DP_PIXEL_FORMAT, DP_PIXEL_ENCODING, mask_sh),\
        SE_SF(DP0_DP_PIXEL_FORMAT, DP_COMPONENT_DEPTH, mask_sh),\

diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h
index b20eb04724bb9ab7479168f30d0f20fd83c64507..ad33427192c60c34f5a7993718e27dc3f1e545b1 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h
+++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h
@@ -28,68 +28,6 @@
 
 #include "dcn21/dcn21_hubbub.h"
 
-#define HUBBUB_REG_LIST_DCN32(id)\
-       SR(DCHUBBUB_ARB_DATA_URGENCY_WATERMARK_A),\
-       SR(DCHUBBUB_ARB_DATA_URGENCY_WATERMARK_B),\
-       SR(DCHUBBUB_ARB_DATA_URGENCY_WATERMARK_C),\
-       SR(DCHUBBUB_ARB_DATA_URGENCY_WATERMARK_D),\
-       SR(DCHUBBUB_ARB_WATERMARK_CHANGE_CNTL),\
-       SR(DCHUBBUB_ARB_DRAM_STATE_CNTL),\
-       SR(DCHUBBUB_ARB_SAT_LEVEL),\
-       SR(DCHUBBUB_ARB_DF_REQ_OUTSTAND),\
-       SR(DCHUBBUB_GLOBAL_TIMER_CNTL), \
-       SR(DCHUBBUB_SOFT_RESET),\
-       SR(DCHUBBUB_CRC_CTRL), \
-       SR(DCN_VM_FB_LOCATION_BASE),\
-       SR(DCN_VM_FB_LOCATION_TOP),\
-       SR(DCN_VM_FB_OFFSET),\
-       SR(DCN_VM_AGP_BOT),\
-       SR(DCN_VM_AGP_TOP),\
-       SR(DCN_VM_AGP_BASE),\
-       HUBBUB_SR_WATERMARK_REG_LIST(), \
-       SR(DCHUBBUB_ARB_FRAC_URG_BW_NOM_A),\
-       SR(DCHUBBUB_ARB_FRAC_URG_BW_NOM_B),\
-       SR(DCHUBBUB_ARB_FRAC_URG_BW_NOM_C),\
-       SR(DCHUBBUB_ARB_FRAC_URG_BW_NOM_D),\
-       SR(DCHUBBUB_ARB_FRAC_URG_BW_FLIP_A),\
-       SR(DCHUBBUB_ARB_FRAC_URG_BW_FLIP_B),\
-       SR(DCHUBBUB_ARB_FRAC_URG_BW_FLIP_C),\
-       SR(DCHUBBUB_ARB_FRAC_URG_BW_FLIP_D),\
-       SR(DCHUBBUB_ARB_REFCYC_PER_TRIP_TO_MEMORY_A),\
-       SR(DCHUBBUB_ARB_REFCYC_PER_TRIP_TO_MEMORY_B),\
-       SR(DCHUBBUB_ARB_REFCYC_PER_TRIP_TO_MEMORY_C),\
-       SR(DCHUBBUB_ARB_REFCYC_PER_TRIP_TO_MEMORY_D),\
-       SR(DCHUBBUB_DET0_CTRL),\
-       SR(DCHUBBUB_DET1_CTRL),\
-       SR(DCHUBBUB_DET2_CTRL),\
-       SR(DCHUBBUB_DET3_CTRL),\
-       SR(DCHUBBUB_COMPBUF_CTRL),\
-       SR(COMPBUF_RESERVED_SPACE),\
-       SR(DCHUBBUB_DEBUG_CTRL_0),\
-       SR(DCHUBBUB_ARB_USR_RETRAINING_CNTL),\
-       SR(DCHUBBUB_ARB_USR_RETRAINING_WATERMARK_A),\
-       SR(DCHUBBUB_ARB_USR_RETRAINING_WATERMARK_B),\
-       SR(DCHUBBUB_ARB_USR_RETRAINING_WATERMARK_C),\
-       SR(DCHUBBUB_ARB_USR_RETRAINING_WATERMARK_D),\
-       SR(DCHUBBUB_ARB_UCLK_PSTATE_CHANGE_WATERMARK_A),\
-       SR(DCHUBBUB_ARB_UCLK_PSTATE_CHANGE_WATERMARK_B),\
-       SR(DCHUBBUB_ARB_UCLK_PSTATE_CHANGE_WATERMARK_C),\
-       SR(DCHUBBUB_ARB_UCLK_PSTATE_CHANGE_WATERMARK_D),\
-       SR(DCHUBBUB_ARB_FCLK_PSTATE_CHANGE_WATERMARK_A),\
-       SR(DCHUBBUB_ARB_FCLK_PSTATE_CHANGE_WATERMARK_B),\
-       SR(DCHUBBUB_ARB_FCLK_PSTATE_CHANGE_WATERMARK_C),\
-       SR(DCHUBBUB_ARB_FCLK_PSTATE_CHANGE_WATERMARK_D),\
-       SR(DCN_VM_FAULT_ADDR_MSB),\
-       SR(DCN_VM_FAULT_ADDR_LSB),\
-       SR(DCN_VM_FAULT_CNTL),\
-       SR(DCN_VM_FAULT_STATUS),\
-       SR(SDPIF_REQUEST_RATE_LIMIT),\
-       SR(DCHUBBUB_CLOCK_CNTL),\
-       SR(DCHUBBUB_SDPIF_CFG0),\
-       SR(DCHUBBUB_SDPIF_CFG1),\
-       SR(DCHUBBUB_MEM_PWR_MODE_CTRL)
-
-
 #define HUBBUB_MASK_SH_LIST_DCN32(mask_sh)\
        HUBBUB_SF(DCHUBBUB_GLOBAL_TIMER_CNTL, DCHUBBUB_GLOBAL_TIMER_ENABLE, mask_sh), \
        HUBBUB_SF(DCHUBBUB_SOFT_RESET, DCHUBBUB_GLOBAL_SOFT_RESET, mask_sh), \

diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.h b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.h
index 4cdbf63c952bc759563e980ec71369f99236375b..d5e5ed8ab869b724539886ca6bf3eeb830b37634 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.h
+++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.h
@@ -31,12 +31,6 @@
 #include "dcn30/dcn30_hubp.h"
 #include "dcn31/dcn31_hubp.h"
 
-#define HUBP_REG_LIST_DCN32(id)\
-       HUBP_REG_LIST_DCN30(id),\
-       SRI(DCHUBP_MALL_CONFIG, HUBP, id),\
-       SRI(DCHUBP_VMPG_CONFIG, HUBP, id),\
-       SRI(UCLK_PSTATE_FORCE, HUBPREQ, id)
-
 #define HUBP_MASK_SH_LIST_DCN32(mask_sh)\
        HUBP_MASK_SH_LIST_DCN31(mask_sh),\
        HUBP_SF(HUBP0_DCHUBP_MALL_CONFIG, USE_MALL_SEL, mask_sh),\

diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.h b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.h
index 5e57c39235fab070ae7613080bb5b497944582b8..b92ba8c75694034c10c310c6284a9e0c949fb03c 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.h
+++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.h
@@ -28,77 +28,6 @@
 
 #include "dcn10/dcn10_optc.h"
 
-#define OPTC_COMMON_REG_LIST_DCN3_2(inst) \
-       SRI(OTG_VSTARTUP_PARAM, OTG, inst),\
-       SRI(OTG_VUPDATE_PARAM, OTG, inst),\
-       SRI(OTG_VREADY_PARAM, OTG, inst),\
-       SRI(OTG_MASTER_UPDATE_LOCK, OTG, inst),\
-       SRI(OTG_GLOBAL_CONTROL0, OTG, inst),\
-       SRI(OTG_GLOBAL_CONTROL1, OTG, inst),\
-       SRI(OTG_GLOBAL_CONTROL2, OTG, inst),\
-       SRI(OTG_GLOBAL_CONTROL4, OTG, inst),\
-       SRI(OTG_DOUBLE_BUFFER_CONTROL, OTG, inst),\
-       SRI(OTG_H_TOTAL, OTG, inst),\
-       SRI(OTG_H_BLANK_START_END, OTG, inst),\
-       SRI(OTG_H_SYNC_A, OTG, inst),\
-       SRI(OTG_H_SYNC_A_CNTL, OTG, inst),\
-       SRI(OTG_H_TIMING_CNTL, OTG, inst),\
-       SRI(OTG_V_TOTAL, OTG, inst),\
-       SRI(OTG_V_BLANK_START_END, OTG, inst),\
-       SRI(OTG_V_SYNC_A, OTG, inst),\
-       SRI(OTG_V_SYNC_A_CNTL, OTG, inst),\
-       SRI(OTG_CONTROL, OTG, inst),\
-       SRI(OTG_STEREO_CONTROL, OTG, inst),\
-       SRI(OTG_3D_STRUCTURE_CONTROL, OTG, inst),\
-       SRI(OTG_STEREO_STATUS, OTG, inst),\
-       SRI(OTG_V_TOTAL_MAX, OTG, inst),\
-       SRI(OTG_V_TOTAL_MIN, OTG, inst),\
-       SRI(OTG_V_TOTAL_CONTROL, OTG, inst),\
-       SRI(OTG_TRIGA_CNTL, OTG, inst),\
-       SRI(OTG_FORCE_COUNT_NOW_CNTL, OTG, inst),\
-       SRI(OTG_STATIC_SCREEN_CONTROL, OTG, inst),\
-       SRI(OTG_STATUS_FRAME_COUNT, OTG, inst),\
-       SRI(OTG_STATUS, OTG, inst),\
-       SRI(OTG_STATUS_POSITION, OTG, inst),\
-       SRI(OTG_NOM_VERT_POSITION, OTG, inst),\
-       SRI(OTG_M_CONST_DTO0, OTG, inst),\
-       SRI(OTG_M_CONST_DTO1, OTG, inst),\
-       SRI(OTG_CLOCK_CONTROL, OTG, inst),\
-       SRI(OTG_VERTICAL_INTERRUPT0_CONTROL, OTG, inst),\
-       SRI(OTG_VERTICAL_INTERRUPT0_POSITION, OTG, inst),\
-       SRI(OTG_VERTICAL_INTERRUPT1_CONTROL, OTG, inst),\
-       SRI(OTG_VERTICAL_INTERRUPT1_POSITION, OTG, inst),\
-       SRI(OTG_VERTICAL_INTERRUPT2_CONTROL, OTG, inst),\
-       SRI(OTG_VERTICAL_INTERRUPT2_POSITION, OTG, inst),\
-       SRI(OPTC_INPUT_CLOCK_CONTROL, ODM, inst),\
-       SRI(OPTC_DATA_SOURCE_SELECT, ODM, inst),\
-       SRI(OPTC_INPUT_GLOBAL_CONTROL, ODM, inst),\
-       SRI(CONTROL, VTG, inst),\
-       SRI(OTG_VERT_SYNC_CONTROL, OTG, inst),\
-       SRI(OTG_GSL_CONTROL, OTG, inst),\
-       SRI(OTG_CRC_CNTL, OTG, inst),\
-       SRI(OTG_CRC0_DATA_RG, OTG, inst),\
-       SRI(OTG_CRC0_DATA_B, OTG, inst),\
-       SRI(OTG_CRC0_WINDOWA_X_CONTROL, OTG, inst),\
-       SRI(OTG_CRC0_WINDOWA_Y_CONTROL, OTG, inst),\
-       SRI(OTG_CRC0_WINDOWB_X_CONTROL, OTG, inst),\
-       SRI(OTG_CRC0_WINDOWB_Y_CONTROL, OTG, inst),\
-       SR(GSL_SOURCE_SELECT),\
-       SRI(OTG_TRIGA_MANUAL_TRIG, OTG, inst),\
-       SRI(OTG_GLOBAL_CONTROL1, OTG, inst),\
-       SRI(OTG_GLOBAL_CONTROL2, OTG, inst),\
-       SRI(OTG_GSL_WINDOW_X, OTG, inst),\
-       SRI(OTG_GSL_WINDOW_Y, OTG, inst),\
-       SRI(OTG_VUPDATE_KEEPOUT, OTG, inst),\
-       SRI(OTG_DSC_START_POSITION, OTG, inst),\
-       SRI(OTG_DRR_TRIGGER_WINDOW, OTG, inst),\
-       SRI(OTG_DRR_V_TOTAL_CHANGE, OTG, inst),\
-       SRI(OPTC_DATA_FORMAT_CONTROL, ODM, inst),\
-       SRI(OPTC_BYTES_PER_PIXEL, ODM, inst),\
-       SRI(OPTC_WIDTH_CONTROL, ODM, inst),\
-       SRI(OPTC_MEMORY_CONFIG, ODM, inst),\
-       SRI(OTG_DRR_CONTROL, OTG, inst)
-
 #define OPTC_COMMON_MASK_SH_LIST_DCN3_2(mask_sh)\
        SF(OTG0_OTG_VSTARTUP_PARAM, VSTARTUP_START, mask_sh),\
        SF(OTG0_OTG_VUPDATE_PARAM, VUPDATE_OFFSET, mask_sh),\