Commit df043738 authored by Roman Li's avatar Roman Li Committed by Alex Deucher
Browse files

drm/amd/display: Refactor ABM_MASK_SH_LIST_DCN301 naming 



[Why]
All DCN3x resources share ABM_MASK_SH_LIST_DCN301 definition.
The naming is misleading since it looks like DCN30 code
depends on next version DCN301, which in fact is vice-versa.

[How]
Refactor the naming to ABM_MASK_SH_LIST_DCN30.

v2: squash in build fixes (Alex)

Signed-off-by: default avatarRoman Li <roman.li@amd.com>
Acked-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bf479f5a

drivers/gpu/drm/amd/display/dc/dce/dce_abm.h

+2 −2
Original line number Diff line number Diff line
@@ -189,8 +189,8 @@ 


#define ABM_MASK_SH_LIST_DCN20(mask_sh) ABM_MASK_SH_LIST_DCE110(mask_sh)



#if defined(CONFIG_DRM_AMD_DC_DCN3_0) || defined(CONFIG_DRM_AMD_DC_DCN3_01)

#define ABM_MASK_SH_LIST_DCN301(mask_sh) ABM_MASK_SH_LIST_DCN10(mask_sh)

#if defined(CONFIG_DRM_AMD_DC_DCN3_0)

#define ABM_MASK_SH_LIST_DCN30(mask_sh) ABM_MASK_SH_LIST_DCN10(mask_sh)

#endif



#define ABM_REG_FIELD_LIST(type) \

drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c

+2 −2
Original line number Diff line number Diff line
@@ -355,11 +355,11 @@ static const struct dce_abm_registers abm_regs[] = { 
};



static const struct dce_abm_shift abm_shift = {

		ABM_MASK_SH_LIST_DCN301(__SHIFT)

		ABM_MASK_SH_LIST_DCN30(__SHIFT)

};



static const struct dce_abm_mask abm_mask = {

		ABM_MASK_SH_LIST_DCN301(_MASK)

		ABM_MASK_SH_LIST_DCN30(_MASK)

};

drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c

+2 −2
Original line number Diff line number Diff line
@@ -363,11 +363,11 @@ static const struct dce_abm_registers abm_regs[] = { 
};



static const struct dce_abm_shift abm_shift = {

		ABM_MASK_SH_LIST_DCN301(__SHIFT)

		ABM_MASK_SH_LIST_DCN30(__SHIFT)

};



static const struct dce_abm_mask abm_mask = {

		ABM_MASK_SH_LIST_DCN301(_MASK)

		ABM_MASK_SH_LIST_DCN30(_MASK)

};



#define audio_regs(id)\

drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c

+2 −2
Original line number Diff line number Diff line
@@ -1276,11 +1276,11 @@ static const struct dce_abm_registers abm_regs[] = { 
};



static const struct dce_abm_shift abm_shift = {

		ABM_MASK_SH_LIST_DCN301(__SHIFT)

		ABM_MASK_SH_LIST_DCN30(__SHIFT)

};



static const struct dce_abm_mask abm_mask = {

		ABM_MASK_SH_LIST_DCN301(_MASK)

		ABM_MASK_SH_LIST_DCN30(_MASK)

};



static bool dcn302_resource_construct(