Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04db4e8a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "disp: msm: dp: use updated colorimetry and DSC definitions" into display-kernel.lnx.5.4

parents 8a690a0b 982574f0

msm/dp/dp_panel.c

+5 −8
Original line number Diff line number Diff line
@@ -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;

msm/sde/sde_connector.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}