Skip to content

Commit 7261305

Browse files
ckborahMaarten Lankhorst
authored andcommitted
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: 65db7a1 ("drm/i915/color: Add 3D LUT to color pipeline") Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com> Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com> Reviewed-by: Uma Shankar <uma.shankar@intel.com> Signed-off-by: Maarten Lankhorst <dev@lankhorst.se> Acked-by: Jani Nikula <jani.nikula@intel.com> Link: https://patch.msgid.link/20260113102303.724205-2-chaitanya.kumar.borah@intel.com
1 parent 604826a commit 7261305

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,15 @@ int _intel_color_pipeline_plane_init(struct drm_plane *plane, struct drm_prop_en
3939
/* TODO: handle failures and clean up */
4040
prev_op = &colorop->base;
4141

42+
colorop = intel_colorop_create(INTEL_PLANE_CB_CSC);
43+
ret = drm_plane_colorop_ctm_3x4_init(dev, &colorop->base, plane,
44+
DRM_COLOROP_FLAG_ALLOW_BYPASS);
45+
if (ret)
46+
return ret;
47+
48+
drm_colorop_set_next_property(prev_op, &colorop->base);
49+
prev_op = &colorop->base;
50+
4251
if (DISPLAY_VER(display) >= 35 &&
4352
intel_color_crtc_has_3dlut(display, pipe) &&
4453
plane->type == DRM_PLANE_TYPE_PRIMARY) {
@@ -55,15 +64,6 @@ int _intel_color_pipeline_plane_init(struct drm_plane *plane, struct drm_prop_en
5564
prev_op = &colorop->base;
5665
}
5766

58-
colorop = intel_colorop_create(INTEL_PLANE_CB_CSC);
59-
ret = drm_plane_colorop_ctm_3x4_init(dev, &colorop->base, plane,
60-
DRM_COLOROP_FLAG_ALLOW_BYPASS);
61-
if (ret)
62-
return ret;
63-
64-
drm_colorop_set_next_property(prev_op, &colorop->base);
65-
prev_op = &colorop->base;
66-
6767
colorop = intel_colorop_create(INTEL_PLANE_CB_POST_CSC_LUT);
6868
ret = drm_plane_colorop_curve_1d_lut_init(dev, &colorop->base, plane,
6969
PLANE_GAMMA_SIZE,

0 commit comments

Comments
 (0)