diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/1032-drm-amd-display-Restore-missing-DCE8-xfm-regs.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/1032-drm-amd-display-Restore-missing-DCE8-xfm-regs.patch | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/1032-drm-amd-display-Restore-missing-DCE8-xfm-regs.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/1032-drm-amd-display-Restore-missing-DCE8-xfm-regs.patch new file mode 100644 index 00000000..daebb7a7 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/1032-drm-amd-display-Restore-missing-DCE8-xfm-regs.patch @@ -0,0 +1,73 @@ +From 5f5798716e8423934b5e0e8550b3e22167e17cee Mon Sep 17 00:00:00 2001 +From: Harry Wentland <harry.wentland@amd.com> +Date: Fri, 25 Aug 2017 22:34:51 -0400 +Subject: [PATCH 1032/4131] drm/amd/display: Restore missing DCE8 xfm regs + +Change-Id: I22aab0455e4e813fd4f82a21b37b08ce2c80e320 +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> +--- + drivers/gpu/drm/amd/display/dc/dce/dce_transform.h | 10 ++++++++++ + drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c | 6 +++--- + 2 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_transform.h b/drivers/gpu/drm/amd/display/dc/dce/dce_transform.h +index 9d8c5e1..8e831d4 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce/dce_transform.h ++++ b/drivers/gpu/drm/amd/display/dc/dce/dce_transform.h +@@ -78,6 +78,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), \ +@@ -157,6 +161,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), \ +diff --git a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +index 9234086..5453f02 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +@@ -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)\ +-- +2.7.4 + |