mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [RFC PATCH 1/2] drm/i915/color: only let the owning plane program the 3D LUT
       [not found] <20261118191514.2931270-1-matthew.schwartz@linux.dev>
@ 2026-11-18 19:15 ` Matthew Schwartz
  2026-11-18 19:15 ` [RFC PATCH 2/2] drm/i915/color: load the 3D LUT in the order the hardware indexes it Matthew Schwartz
  1 sibling, 0 replies; 2+ messages in thread
From: Matthew Schwartz @ 2026-11-18 19:15 UTC (permalink / raw)
  To: intel-gfx, intel-xe
  Cc: uma.shankar, chaitanya.kumar.borah, Matthew Schwartz,
	Jani Nikula, Rodrigo Vivi, Joonas Lahtinen, Tvrtko Ursulin,
	David Airlie, Simona Vetter, Suraj Kandpal, dri-devel,
	linux-kernel

intel_color_plane_commit_arm() runs for every universal plane on pipes A
and B and rewrites LUT_3D_CTL from that plane's own 3D LUT state. Only
the primary plane on Xe3p_LPD can carry a 3D LUT colorop, so any other
plane update on those pipes disables the LUT the primary plane enabled,
and on older platforms every plane update writes a register no plane
owns.

Give the "Xe3p_LPD primary plane owns the 3D LUT" rule a single helper
and use it both to build the plane color pipeline and to decide who may
write LUT_3D_CTL.

Fixes: 65db7a1f9cf7 ("drm/i915/color: Add 3D LUT to color pipeline")
Signed-off-by: Matthew Schwartz <matthew.schwartz@linux.dev>
---
 drivers/gpu/drm/i915/display/intel_color.c          | 10 +++++++++-
 drivers/gpu/drm/i915/display/intel_color.h          |  3 +++
 drivers/gpu/drm/i915/display/intel_color_pipeline.c | 10 +---------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c
index 4070dc8d97d9..742ae471540d 100644
--- a/drivers/gpu/drm/i915/display/intel_color.c
+++ b/drivers/gpu/drm/i915/display/intel_color.c
@@ -4278,9 +4278,10 @@ void intel_color_plane_commit_arm(struct intel_dsb *dsb,
 				  const struct intel_plane_state *plane_state)
 {
 	struct intel_display *display = to_intel_display(plane_state);
+	struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
 	struct intel_crtc *crtc = to_intel_crtc(plane_state->uapi.crtc);
 
-	if (crtc && intel_color_crtc_has_3dlut(display, crtc->pipe))
+	if (crtc && intel_color_plane_has_3dlut(display, plane->pipe, plane->id))
 		glk_lut_3d_commit(dsb, crtc, !!plane_state->hw.lut_3d);
 }
 
@@ -4313,6 +4314,13 @@ intel_color_crtc_has_3dlut(struct intel_display *display, enum pipe pipe)
 		return false;
 }
 
+bool intel_color_plane_has_3dlut(struct intel_display *display,
+				 enum pipe pipe, enum plane_id plane_id)
+{
+	return DISPLAY_VER(display) >= 35 && plane_id == PLANE_PRIMARY &&
+		intel_color_crtc_has_3dlut(display, pipe);
+}
+
 static void
 intel_color_load_3dlut(struct intel_dsb *dsb,
 		       const struct intel_plane_state *plane_state)
diff --git a/drivers/gpu/drm/i915/display/intel_color.h b/drivers/gpu/drm/i915/display/intel_color.h
index f3963a8d1239..9d11741423ef 100644
--- a/drivers/gpu/drm/i915/display/intel_color.h
+++ b/drivers/gpu/drm/i915/display/intel_color.h
@@ -16,6 +16,7 @@ struct intel_dsb;
 struct intel_plane_state;
 struct drm_property_blob;
 enum pipe;
+enum plane_id;
 
 void intel_color_init_hooks(struct intel_display *display);
 int intel_color_init(struct intel_display *display);
@@ -47,6 +48,8 @@ void intel_color_plane_program_pipeline(struct intel_dsb *dsb,
 void intel_color_plane_commit_arm(struct intel_dsb *dsb,
 				  const struct intel_plane_state *plane_state);
 bool intel_color_crtc_has_3dlut(struct intel_display *display, enum pipe pipe);
+bool intel_color_plane_has_3dlut(struct intel_display *display,
+				 enum pipe pipe, enum plane_id plane_id);
 u32 intel_color_background_color_drm_to_hw(u64 drm_background_color);
 u64 intel_color_background_color_hw_to_drm(u32 hw_background_color);
 
diff --git a/drivers/gpu/drm/i915/display/intel_color_pipeline.c b/drivers/gpu/drm/i915/display/intel_color_pipeline.c
index 7fc31fe891a8..77f65182e3e3 100644
--- a/drivers/gpu/drm/i915/display/intel_color_pipeline.c
+++ b/drivers/gpu/drm/i915/display/intel_color_pipeline.c
@@ -58,14 +58,6 @@ static const u64 intel_plane_supported_csc_ff =
 		BIT(DRM_COLOROP_FM_YCBCR2020_NC_FULL_RGB) |
 		BIT(DRM_COLOROP_FM_YCBCR2020_NC_LIMITED_RGB);
 
-static bool plane_has_3dlut(struct intel_display *display, enum pipe pipe,
-			    struct drm_plane *plane)
-{
-	return (DISPLAY_VER(display) >= 35 &&
-		intel_color_crtc_has_3dlut(display, pipe) &&
-		plane->type == DRM_PLANE_TYPE_PRIMARY);
-}
-
 static
 struct intel_colorop *intel_color_pipeline_plane_add_colorop(struct drm_plane *plane,
 							     struct intel_colorop *prev,
@@ -144,7 +136,7 @@ int _intel_color_pipeline_plane_init(struct drm_plane *plane, struct drm_prop_en
 	int ret = 0;
 	int i;
 
-	if (plane_has_3dlut(display, pipe, plane)) {
+	if (intel_color_plane_has_3dlut(display, pipe, to_intel_plane(plane)->id)) {
 		pipeline = xe3plpd_primary_plane_pipeline;
 		pipeline_len = ARRAY_SIZE(xe3plpd_primary_plane_pipeline);
 	} else if (icl_is_hdr_plane(display, to_intel_plane(plane)->id)) {
-- 
2.56.1


^ permalink raw reply	[flat|nested] 2+ messages in thread

* [RFC PATCH 2/2] drm/i915/color: load the 3D LUT in the order the hardware indexes it
       [not found] <20261118191514.2931270-1-matthew.schwartz@linux.dev>
  2026-11-18 19:15 ` [RFC PATCH 1/2] drm/i915/color: only let the owning plane program the 3D LUT Matthew Schwartz
@ 2026-11-18 19:15 ` Matthew Schwartz
  1 sibling, 0 replies; 2+ messages in thread
From: Matthew Schwartz @ 2026-11-18 19:15 UTC (permalink / raw)
  To: intel-gfx, intel-xe
  Cc: uma.shankar, chaitanya.kumar.borah, Matthew Schwartz,
	Jani Nikula, Rodrigo Vivi, Joonas Lahtinen, Tvrtko Ursulin,
	David Airlie, Simona Vetter, Suraj Kandpal, dri-devel,
	linux-kernel

The 3D LUT colorop blob is laid out with red as the fastest axis,
index = R + n * (G + n * B). glk_load_lut_3d() writes the blob to
LUT_3D_DATA front to back, but the hardware walks its table with blue as
the fastest axis and red as the slowest. Every entry whose red and blue
coordinates differ lands at the node with the two exchanged.

Measured on Lunar Lake by programming the pipe-bound LUT through
LUT_3D_INDEX and LUT_3D_DATA directly and decoding the pipe CRC of solid
color frames. A table holding each node's own stream position reads back
position B + 17 * G + 289 * R, and an identity table written in that
order reproduces all of 70 sampled colors exactly.

Write the table in hardware order.

Fixes: 65db7a1f9cf7 ("drm/i915/color: Add 3D LUT to color pipeline")
Signed-off-by: Matthew Schwartz <matthew.schwartz@linux.dev>
---
 drivers/gpu/drm/i915/display/intel_color.c     | 18 +++++++++++++++---
 drivers/gpu/drm/i915/display/intel_color.h     |  2 ++
 .../drm/i915/display/intel_color_pipeline.c    |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c
index 742ae471540d..ea4e6c9f0309 100644
--- a/drivers/gpu/drm/i915/display/intel_color.c
+++ b/drivers/gpu/drm/i915/display/intel_color.c
@@ -4112,8 +4112,8 @@ static void glk_load_lut_3d(struct intel_dsb *dsb,
 {
 	struct intel_display *display = to_intel_display(crtc->base.dev);
 	const struct drm_color_lut32 *lut = blob->data;
-	int i, lut_size = drm_color_lut32_size(blob);
 	enum pipe pipe = crtc->pipe;
+	int r, g, b;
 
 	if (!dsb && intel_de_read(display, LUT_3D_CTL(pipe)) & LUT_3D_READY) {
 		drm_err(display->drm, "[CRTC:%d:%s] 3D LUT not ready, not loading LUTs\n",
@@ -4121,9 +4121,21 @@ static void glk_load_lut_3d(struct intel_dsb *dsb,
 		return;
 	}
 
+	/*
+	 * The hardware walks the table with blue as the fastest axis, the
+	 * colorop blob with red.
+	 */
 	intel_de_write_dsb(display, dsb, LUT_3D_INDEX(pipe), LUT_3D_AUTO_INCREMENT);
-	for (i = 0; i < lut_size; i++)
-		intel_de_write_dsb(display, dsb, LUT_3D_DATA(pipe), glk_3dlut_10(&lut[i]));
+	for (r = 0; r < LUT_3D_SIZE; r++) {
+		for (g = 0; g < LUT_3D_SIZE; g++) {
+			for (b = 0; b < LUT_3D_SIZE; b++) {
+				int i = r + LUT_3D_SIZE * (g + LUT_3D_SIZE * b);
+
+				intel_de_write_dsb(display, dsb, LUT_3D_DATA(pipe),
+						   glk_3dlut_10(&lut[i]));
+			}
+		}
+	}
 	intel_de_write_dsb(display, dsb, LUT_3D_INDEX(pipe), 0);
 }
 
diff --git a/drivers/gpu/drm/i915/display/intel_color.h b/drivers/gpu/drm/i915/display/intel_color.h
index 9d11741423ef..02ef30390558 100644
--- a/drivers/gpu/drm/i915/display/intel_color.h
+++ b/drivers/gpu/drm/i915/display/intel_color.h
@@ -18,6 +18,8 @@ struct drm_property_blob;
 enum pipe;
 enum plane_id;
 
+#define LUT_3D_SIZE 17
+
 void intel_color_init_hooks(struct intel_display *display);
 int intel_color_init(struct intel_display *display);
 void intel_color_crtc_init(struct intel_crtc *crtc);
diff --git a/drivers/gpu/drm/i915/display/intel_color_pipeline.c b/drivers/gpu/drm/i915/display/intel_color_pipeline.c
index 77f65182e3e3..0c73072819fb 100644
--- a/drivers/gpu/drm/i915/display/intel_color_pipeline.c
+++ b/drivers/gpu/drm/i915/display/intel_color_pipeline.c
@@ -88,7 +88,7 @@ struct intel_colorop *intel_color_pipeline_plane_add_colorop(struct drm_plane *p
 		break;
 	case INTEL_PLANE_CB_3DLUT:
 		ret = drm_plane_colorop_3dlut_init(dev, &colorop->base, plane,
-						   &intel_colorop_funcs, 17,
+						   &intel_colorop_funcs, LUT_3D_SIZE,
 						   DRM_COLOROP_LUT3D_INTERPOLATION_TETRAHEDRAL,
 						   true);
 		break;
-- 
2.56.1


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-11-18 19:15 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <20261118191514.2931270-1-matthew.schwartz@linux.dev>
2026-11-18 19:15 ` [RFC PATCH 1/2] drm/i915/color: only let the owning plane program the 3D LUT Matthew Schwartz
2026-11-18 19:15 ` [RFC PATCH 2/2] drm/i915/color: load the 3D LUT in the order the hardware indexes it Matthew Schwartz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®