Commit 7261305d authored by Chaitanya Kumar Borah's avatar Chaitanya Kumar Borah Committed by Maarten Lankhorst
Browse files

drm/i915/color: Place 3D LUT after CSC in plane color pipeline 



Move the 3D LUT block to its correct position in the plane
color pipeline:

  [Pre-CSC] -> [CSC] -> [3DLUT] -> [Post-CSC]

Fixes: 65db7a1f ("drm/i915/color: Add 3D LUT to color pipeline")
Signed-off-by: default avatarChaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Reviewed-by: default avatarSuraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: default avatarUma Shankar <uma.shankar@intel.com>
Signed-off-by: default avatarMaarten Lankhorst <dev@lankhorst.se>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patch.msgid.link/20260113102303.724205-2-chaitanya.kumar.borah@intel.com
parent 604826ac

drivers/gpu/drm/i915/display/intel_color_pipeline.c

+9 −9
Original line number Diff line number Diff line
@@ -39,6 +39,15 @@ int _intel_color_pipeline_plane_init(struct drm_plane *plane, struct drm_prop_en 
	/* TODO: handle failures and clean up */

	prev_op = &colorop->base;



	colorop = intel_colorop_create(INTEL_PLANE_CB_CSC);

	ret = drm_plane_colorop_ctm_3x4_init(dev, &colorop->base, plane,

					     DRM_COLOROP_FLAG_ALLOW_BYPASS);

	if (ret)

		return ret;



	drm_colorop_set_next_property(prev_op, &colorop->base);

	prev_op = &colorop->base;



	if (DISPLAY_VER(display) >= 35 &&

	    intel_color_crtc_has_3dlut(display, pipe) &&

	    plane->type == DRM_PLANE_TYPE_PRIMARY) {
@@ -55,15 +64,6 @@ int _intel_color_pipeline_plane_init(struct drm_plane *plane, struct drm_prop_en 
		prev_op = &colorop->base;

	}



	colorop = intel_colorop_create(INTEL_PLANE_CB_CSC);

	ret = drm_plane_colorop_ctm_3x4_init(dev, &colorop->base, plane,

					     DRM_COLOROP_FLAG_ALLOW_BYPASS);

	if (ret)

		return ret;



	drm_colorop_set_next_property(prev_op, &colorop->base);

	prev_op = &colorop->base;



	colorop = intel_colorop_create(INTEL_PLANE_CB_POST_CSC_LUT);

	ret = drm_plane_colorop_curve_1d_lut_init(dev, &colorop->base, plane,

						  PLANE_GAMMA_SIZE,