From 982574f095194467edd3539ea032b94233736a9d Mon Sep 17 00:00:00 2001 From: Tatenda Chipeperekwa Date: Fri, 17 Jan 2020 15:54:10 -0800 Subject: [PATCH] disp: msm: dp: use updated colorimetry and DSC definitions Update colorimetry definition usage and how we access DSC information as per changes in the upstream DRM framework code. Change-Id: Ie52aed2df2f6c3f2df1e4129f342a85256f8fae4 Signed-off-by: Tatenda Chipeperekwa --- msm/dp/dp_panel.c | 13 +++++-------- msm/sde/sde_connector.c | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/msm/dp/dp_panel.c b/msm/dp/dp_panel.c index 953b1c940092..a6977d8e954e 100644 --- a/msm/dp/dp_panel.c +++ b/msm/dp/dp_panel.c @@ -268,13 +268,10 @@ static u8 get_misc_colorimetry_val(struct dp_panel_private *panel, case DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER: colorimetry = 0x7; break; - case DRM_MODE_DP_COLORIMETRY_SRGB: - colorimetry = 0x4; - break; - case DRM_MODE_DP_COLORIMETRY_RGB_WIDE_GAMUT: + case DRM_MODE_COLORIMETRY_RGB_WIDE_FIXED: colorimetry = 0x3; break; - case DRM_MODE_DP_COLORIMETRY_SCRGB: + case DRM_MODE_COLORIMETRY_RGB_WIDE_FLOAT: colorimetry = 0xb; break; case DRM_MODE_COLORIMETRY_OPRGB: @@ -1211,7 +1208,7 @@ static void dp_panel_dsc_pclk_param_calc(struct dp_panel *dp_panel, u8 ratio, struct dp_display_mode *dp_mode) { - int comp_ratio, intf_width; + int comp_ratio = 100, intf_width; int slice_per_pkt, slice_per_intf; s64 temp1_fp, temp2_fp; s64 numerator_fp, denominator_fp; @@ -1219,8 +1216,8 @@ static void dp_panel_dsc_pclk_param_calc(struct dp_panel *dp_panel, u32 dsc_byte_count, temp1, temp2; intf_width = dp_mode->timing.h_active; - if (!dsc || !dsc->slice_width || !dsc->slice_per_pkt || - (intf_width < dsc->slice_width)) + if (!dsc || !dsc->config.slice_width || !dsc->slice_per_pkt || + (intf_width < dsc->config.slice_width)) return; slice_per_pkt = dsc->slice_per_pkt; diff --git a/msm/sde/sde_connector.c b/msm/sde/sde_connector.c index d4dd3686d0ca..bd7c1e5ac029 100644 --- a/msm/sde/sde_connector.c +++ b/msm/sde/sde_connector.c @@ -2445,7 +2445,7 @@ static int _sde_connector_install_properties(struct drm_device *dev, CONNECTOR_PROP_EXT_HDR_INFO); /* create and attach colorspace property for DP */ - if (!drm_mode_create_colorspace_property(connector)) + if (!drm_mode_create_dp_colorspace_property(connector)) drm_object_attach_property(&connector->base, connector->colorspace_property, 0); }