samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "disp: msm: dp: use updated colorimetry and DSC definitions"

Browse Source 
This reverts commit 982574f095.
This is required to satisfy cross component dependencies with
kernel-5.4.

Change-Id: I979e0371973376c46f2a11659348df726be2679d
Signed-off-by: Tatenda Chipeperekwa <tatendac@codeaurora.org>
This commit is contained in:
Tatenda Chipeperekwa
2020-03-04 17:44:41 -08:00
parent 04db4e8a6b
commit 43599c49a3
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
msm/dp/dp_panel.c
View File

@@ -268,10 +268,13 @@ static u8 get_misc_colorimetry_val(struct dp_panel_private *panel,
case DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER: case DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER:
colorimetry = 0x7; colorimetry = 0x7;
break; break;
case DRM_MODE_COLORIMETRY_RGB_WIDE_FIXED: case DRM_MODE_DP_COLORIMETRY_SRGB:
colorimetry = 0x4;
break;
case DRM_MODE_DP_COLORIMETRY_RGB_WIDE_GAMUT:
colorimetry = 0x3; colorimetry = 0x3;
break; break;
case DRM_MODE_COLORIMETRY_RGB_WIDE_FLOAT: case DRM_MODE_DP_COLORIMETRY_SCRGB:
colorimetry = 0xb; colorimetry = 0xb;
break; break;
case DRM_MODE_COLORIMETRY_OPRGB: case DRM_MODE_COLORIMETRY_OPRGB:
@@ -1208,7 +1211,7 @@ static void dp_panel_dsc_pclk_param_calc(struct dp_panel *dp_panel,
u8 ratio, u8 ratio,
struct dp_display_mode *dp_mode) struct dp_display_mode *dp_mode)
{ {
int comp_ratio = 100, intf_width; int comp_ratio, intf_width;
int slice_per_pkt, slice_per_intf; int slice_per_pkt, slice_per_intf;
s64 temp1_fp, temp2_fp; s64 temp1_fp, temp2_fp;
s64 numerator_fp, denominator_fp; s64 numerator_fp, denominator_fp;
@@ -1216,8 +1219,8 @@ static void dp_panel_dsc_pclk_param_calc(struct dp_panel *dp_panel,
u32 dsc_byte_count, temp1, temp2; u32 dsc_byte_count, temp1, temp2;
intf_width = dp_mode->timing.h_active; intf_width = dp_mode->timing.h_active;
if (!dsc || !dsc->config.slice_width || !dsc->slice_per_pkt || if (!dsc || !dsc->slice_width || !dsc->slice_per_pkt ||
(intf_width < dsc->config.slice_width)) (intf_width < dsc->slice_width))
return; return;
slice_per_pkt = dsc->slice_per_pkt; slice_per_pkt = dsc->slice_per_pkt;

2
msm/sde/sde_connector.c
View File

@@ -2445,7 +2445,7 @@ static int _sde_connector_install_properties(struct drm_device *dev,
CONNECTOR_PROP_EXT_HDR_INFO); CONNECTOR_PROP_EXT_HDR_INFO);
/* create and attach colorspace property for DP */ /* create and attach colorspace property for DP */
if (!drm_mode_create_dp_colorspace_property(connector)) if (!drm_mode_create_colorspace_property(connector))
drm_object_attach_property(&connector->base, drm_object_attach_property(&connector->base,
connector->colorspace_property, 0); connector->colorspace_property, 0);
} }