AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-28 11:18:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/amd/display: Restore missing DCE8 xfm regs

Browse Source 
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Roman Li <Roman.Li@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Harry Wentland 2017-08-25 22:34:51 -04:00 committed by Alex Deucher
parent 1d9521a740
commit 513b569339
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/amd/display/dc/dce/dce_transform.h
View File

@ -94,6 +94,10 @@
SRI(SCL_UPDATE, SCL, id), \ SRI(SCL_UPDATE, SCL, id), \
SRI(SCL_F_SHARP_CONTROL, 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) \ #define XFM_COMMON_REG_LIST_DCE100(id) \
XFM_COMMON_REG_LIST_DCE_BASE(id), \ XFM_COMMON_REG_LIST_DCE_BASE(id), \
SRI(DCFE_MEM_PWR_CTRL, CRTC, id), \ SRI(DCFE_MEM_PWR_CTRL, CRTC, id), \
@ -185,6 +189,12 @@
XFM_SF(SCL_UPDATE, SCL_COEF_UPDATE_COMPLETE, mask_sh), \ XFM_SF(SCL_UPDATE, SCL_COEF_UPDATE_COMPLETE, mask_sh), \
XFM_SF(LB_DATA_FORMAT, ALPHA_EN, 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) \ #define XFM_COMMON_MASK_SH_LIST_DCE110(mask_sh) \
XFM_COMMON_MASK_SH_LIST_DCE_COMMON_BASE(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), \ XFM_SF(DCFE_MEM_PWR_CTRL, SCL_COEFF_MEM_PWR_DIS, mask_sh), \

6
drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
View File

@ -187,7 +187,7 @@ static const struct dce_ipp_mask ipp_mask = {
#define transform_regs(id)\ #define transform_regs(id)\
[id] = {\ [id] = {\
XFM_COMMON_REG_LIST_DCE_BASE(id)\ XFM_COMMON_REG_LIST_DCE80(id)\
} }
static const struct dce_transform_registers xfm_regs[] = { 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 = { 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 = { 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)\ #define aux_regs(id)\