[RFC PATCH 1/2] drm/i915/color: only let the owning plane program the 3D LUT

From: Matthew Schwartz

Date: Wed Nov 18 2026 - 14:16:01 EST


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@xxxxxxxxx>
---
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