Commit 513b5693 authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher
Browse files

drm/amd/display: Restore missing DCE8 xfm regs 



Signed-off-by: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarRoman Li <Roman.Li@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1d9521a7

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

+10 −0
Original line number Diff line number Diff line
@@ -94,6 +94,10 @@ 
	SRI(SCL_UPDATE, SCL, id), \

	SRI(SCL_F_SHARP_CONTROL, SCL, id)



#define XFM_COMMON_REG_LIST_DCE80(id) \

	XFM_COMMON_REG_LIST_DCE_BASE(id), \

	SRI(DCFE_MEM_LIGHT_SLEEP_CNTL, CRTC, id)



#define XFM_COMMON_REG_LIST_DCE100(id) \

	XFM_COMMON_REG_LIST_DCE_BASE(id), \

	SRI(DCFE_MEM_PWR_CTRL, CRTC, id), \
@@ -185,6 +189,12 @@ 
	XFM_SF(SCL_UPDATE, SCL_COEF_UPDATE_COMPLETE, mask_sh), \

	XFM_SF(LB_DATA_FORMAT, ALPHA_EN, mask_sh)



#define XFM_COMMON_MASK_SH_LIST_DCE80(mask_sh) \

	XFM_COMMON_MASK_SH_LIST_DCE_COMMON_BASE(mask_sh), \

	OPP_SF(DCFE_MEM_LIGHT_SLEEP_CNTL, REGAMMA_LUT_LIGHT_SLEEP_DIS, mask_sh),\

	OPP_SF(DCFE_MEM_LIGHT_SLEEP_CNTL, DCP_LUT_LIGHT_SLEEP_DIS, mask_sh),\

	OPP_SF(DCFE_MEM_LIGHT_SLEEP_CNTL, REGAMMA_LUT_MEM_PWR_STATE, mask_sh)



#define XFM_COMMON_MASK_SH_LIST_DCE110(mask_sh) \

	XFM_COMMON_MASK_SH_LIST_DCE_COMMON_BASE(mask_sh), \

	XFM_SF(DCFE_MEM_PWR_CTRL, SCL_COEFF_MEM_PWR_DIS, mask_sh), \

drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c

+3 −3
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static const struct dce_ipp_mask ipp_mask = { 


#define transform_regs(id)\

[id] = {\

		XFM_COMMON_REG_LIST_DCE_BASE(id)\

		XFM_COMMON_REG_LIST_DCE80(id)\

}



static const struct dce_transform_registers xfm_regs[] = {
@@ -200,11 +200,11 @@ static const struct dce_transform_registers xfm_regs[] = { 
};



static const struct dce_transform_shift xfm_shift = {

		XFM_COMMON_MASK_SH_LIST_DCE_COMMON_BASE(__SHIFT)

		XFM_COMMON_MASK_SH_LIST_DCE80(__SHIFT)

};



static const struct dce_transform_mask xfm_mask = {

		XFM_COMMON_MASK_SH_LIST_DCE_COMMON_BASE(_MASK)

		XFM_COMMON_MASK_SH_LIST_DCE80(_MASK)

};



#define aux_regs(id)\