Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915/color: Program the 3D LUT on the plane's own pipe with joiner
@ 2026-11-19 16:59 Chaitanya Kumar Borah
  2026-11-19 17:36 ` sashiko-bot
  2026-11-19 23:34 ` ✓ i915.CI.BAT: success for " Patchwork
  0 siblings, 2 replies; 3+ messages in thread
From: Chaitanya Kumar Borah @ 2026-11-19 16:59 UTC (permalink / raw)
  To: intel-xe, intel-gfx; +Cc: Chaitanya Kumar Borah, Uma Shankar

With joiner, a secondary pipe plane's uapi.crtc points at the primary
CRTC. intel_color_load_3dlut() and intel_color_plane_commit_arm() use
it, so the 3D LUT is loaded and enabled twice on the primary pipe and
never on the secondary, leaving the secondary pipe's part of the screen
without it.

Use hw.crtc, the CRTC the plane is actually on.

Cc: Uma Shankar <uma.shankar@intel.com>
Fixes: 65db7a1f9cf7 ("drm/i915/color: Add 3D LUT to color pipeline")
Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
---
 drivers/gpu/drm/i915/display/intel_color.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c
index 4070dc8d97d9..9060c29de533 100644
--- a/drivers/gpu/drm/i915/display/intel_color.c
+++ b/drivers/gpu/drm/i915/display/intel_color.c
@@ -4278,7 +4278,7 @@ 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_crtc *crtc = to_intel_crtc(plane_state->uapi.crtc);
+	struct intel_crtc *crtc = to_intel_crtc(plane_state->hw.crtc);
 
 	if (crtc && intel_color_crtc_has_3dlut(display, crtc->pipe))
 		glk_lut_3d_commit(dsb, crtc, !!plane_state->hw.lut_3d);
@@ -4318,7 +4318,7 @@ intel_color_load_3dlut(struct intel_dsb *dsb,
 		       const struct intel_plane_state *plane_state)
 {
 	struct intel_display *display = to_intel_display(plane_state);
-	struct intel_crtc *crtc = to_intel_crtc(plane_state->uapi.crtc);
+	struct intel_crtc *crtc = to_intel_crtc(plane_state->hw.crtc);
 
 	if (crtc && intel_color_crtc_has_3dlut(display, crtc->pipe))
 		glk_load_lut_3d(dsb, crtc, plane_state->hw.lut_3d);
-- 
2.50.1


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

* Re: [PATCH] drm/i915/color: Program the 3D LUT on the plane's own pipe with joiner
  2026-11-19 16:59 [PATCH] drm/i915/color: Program the 3D LUT on the plane's own pipe with joiner Chaitanya Kumar Borah
@ 2026-11-19 17:36 ` sashiko-bot
  2026-11-19 23:34 ` ✓ i915.CI.BAT: success for " Patchwork
  1 sibling, 0 replies; 3+ messages in thread
From: sashiko-bot @ 2026-11-19 17:36 UTC (permalink / raw)
  To: Chaitanya Kumar Borah, intel-xe, intel-gfx

Thank you for your contribution! Sashiko AI review found 2 potential
issues to consider:
- [High] drm/i915/color: intel_color_plane_commit_arm() disables 3D LUT
  on non-PLANE_1
- [Low] drm/i915/color: inaccurate commit message on joiner secondary
  plane uapi.crtc
--

commit fb7959aa23c8ae58895c1901c0ab349857f2f45e
Author: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>

drm/i915/color: Program the 3D LUT on the plane's own pipe with joiner

This commit switches intel_color_plane_commit_arm() and
intel_color_load_3dlut() from plane_state->uapi.crtc to
plane_state->hw.crtc so 3D LUT registers are programmed on the plane's own
hardware pipe when joiner is active.

> With joiner, a secondary pipe plane's uapi.crtc points at the primary
> CRTC. intel_color_load_3dlut() and intel_color_plane_commit_arm() use
> it, so the 3D LUT is loaded and enabled twice on the primary pipe and
> never on the secondary, leaving the secondary pipe's part of the screen
> without it.

[Severity: Low]
Is this description of a joiner secondary plane's uapi.crtc accurate?

In intel_plane_copy_uapi_to_hw_state(), from_plane_state->uapi.crtc points
at the primary CRTC while the secondary plane's own plane_state->uapi.crtc
remains NULL, so to_intel_crtc(plane_state->uapi.crtc) evaluated to NULL
and skipped programming the secondary pipe rather than loading the 3D LUT
twice on the primary pipe.

> diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c
> index f1df0f9ba7624..31958bee4717d 100644
> --- a/drivers/gpu/drm/i915/display/intel_color.c
> +++ b/drivers/gpu/drm/i915/display/intel_color.c
> @@ -4275,7 +4275,7 @@ 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_crtc *crtc = to_intel_crtc(plane_state->uapi.crtc);
> +	struct intel_crtc *crtc = to_intel_crtc(plane_state->hw.crtc);
>  
>  	if (crtc && intel_color_crtc_has_3dlut(display, crtc->pipe))
>  		glk_lut_3d_commit(dsb, crtc, !!plane_state->hw.lut_3d);

[Severity: High]
Can this disable PLANE_1's active 3D LUT when a linked planar YUV Y-plane
or an overlay plane is committed on the same pipe?

glk_lut_3d_commit() writes the per-pipe LUT_3D_CTL(pipe) register bound to
PLANE_1, and only DRM_PLANE_TYPE_PRIMARY exposes the 3D LUT property, so
plane_state->hw.lut_3d is always NULL on other planes.
icl_plane_update_arm() calls intel_color_plane_commit_arm() for every
visible universal plane and linked Y-plane on the pipe.

For a linked Y-plane during planar YUV scanout on PLANE_1,
intel_plane_y_copy_hw_state() sets y_plane_state->hw.crtc to the CRTC
while leaving uapi.crtc and hw.lut_3d as NULL.  Switching to
plane_state->hw.crtc causes the linked Y-plane update (as well as any
visible overlay plane update) to call glk_lut_3d_commit(dsb, crtc, false),
clearing LUT_3D_CTL(pipe) to 0 on DSB commits or failing the LUT_3D_READY
check with drm_err() on MMIO commits.

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261119165925.683691-1-chaitanya.kumar.borah@intel.com?part=1

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

* ✓ i915.CI.BAT: success for drm/i915/color: Program the 3D LUT on the plane's own pipe with joiner
  2026-11-19 16:59 [PATCH] drm/i915/color: Program the 3D LUT on the plane's own pipe with joiner Chaitanya Kumar Borah
  2026-11-19 17:36 ` sashiko-bot
@ 2026-11-19 23:34 ` Patchwork
  1 sibling, 0 replies; 3+ messages in thread
From: Patchwork @ 2026-11-19 23:34 UTC (permalink / raw)
  To: Chaitanya Kumar Borah; +Cc: intel-gfx

[-- Attachment #1: Type: text/plain, Size: 4581 bytes --]

== Series Details ==

Series: drm/i915/color: Program the 3D LUT on the plane's own pipe with joiner
URL   : https://patchwork.freedesktop.org/series/179122/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_19567 -> Patchwork_179122v1
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179122v1/index.html

Participating hosts (39 -> 37)
------------------------------

  Additional (1): bat-adls-6 
  Missing    (3): bat-dg2-13 bat-mtlp-8 bat-jsl-5 

Known issues
------------

  Here are the changes found in Patchwork_179122v1 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@gem_lmem_swapping@parallel-random-engines:
    - bat-adls-6:         NOTRUN -> [SKIP][1] ([i915#4613]) +3 other tests skip
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179122v1/bat-adls-6/igt@gem_lmem_swapping@parallel-random-engines.html

  * igt@gem_tiled_pread_basic@basic:
    - bat-adls-6:         NOTRUN -> [SKIP][2] ([i915#15656])
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179122v1/bat-adls-6/igt@gem_tiled_pread_basic@basic.html

  * igt@intel_hwmon@hwmon-read:
    - bat-adls-6:         NOTRUN -> [SKIP][3] ([i915#7707]) +1 other test skip
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179122v1/bat-adls-6/igt@intel_hwmon@hwmon-read.html

  * igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
    - bat-adls-6:         NOTRUN -> [SKIP][4] ([i915#4103]) +1 other test skip
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179122v1/bat-adls-6/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html

  * igt@kms_dsc@dsc-basic:
    - bat-adls-6:         NOTRUN -> [SKIP][5] ([i915#16361])
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179122v1/bat-adls-6/igt@kms_dsc@dsc-basic.html

  * igt@kms_force_connector_basic@force-load-detect:
    - bat-adls-6:         NOTRUN -> [SKIP][6] ([i915#17452])
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179122v1/bat-adls-6/igt@kms_force_connector_basic@force-load-detect.html

  * igt@kms_pm_backlight@basic-brightness:
    - bat-adls-6:         NOTRUN -> [SKIP][7] ([i915#5354])
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179122v1/bat-adls-6/igt@kms_pm_backlight@basic-brightness.html

  * igt@kms_psr@psr-primary-mmap-gtt:
    - bat-adls-6:         NOTRUN -> [SKIP][8] ([i915#1072] / [i915#9732]) +3 other tests skip
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179122v1/bat-adls-6/igt@kms_psr@psr-primary-mmap-gtt.html

  * igt@kms_setmode@basic-clone-single-crtc:
    - bat-adls-6:         NOTRUN -> [SKIP][9] ([i915#3555])
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179122v1/bat-adls-6/igt@kms_setmode@basic-clone-single-crtc.html

  * igt@prime_vgem@basic-fence-read:
    - bat-adls-6:         NOTRUN -> [SKIP][10] ([i915#17448] / [i915#3291]) +2 other tests skip
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179122v1/bat-adls-6/igt@prime_vgem@basic-fence-read.html

  
  [i915#1072]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/1072
  [i915#15656]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/15656
  [i915#16361]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/16361
  [i915#17448]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/17448
  [i915#17452]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/17452
  [i915#3291]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3291
  [i915#3555]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3555
  [i915#4103]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4103
  [i915#4613]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4613
  [i915#5354]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/5354
  [i915#7707]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/7707
  [i915#9732]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9732


Build changes
-------------

  * Linux: CI_DRM_19567 -> Patchwork_179122v1

  CI-20190529: 20190529
  CI_DRM_19567: 859a3f2c44944276c49ab8d35f0ffd31b02b19c5 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_9199: f28241ac1ad57574315e7bd31b174294cca2f29c @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  Patchwork_179122v1: 859a3f2c44944276c49ab8d35f0ffd31b02b19c5 @ git://anongit.freedesktop.org/gfx-ci/linux

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179122v1/index.html

[-- Attachment #2: Type: text/html, Size: 5426 bytes --]

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

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

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-19 16:59 [PATCH] drm/i915/color: Program the 3D LUT on the plane's own pipe with joiner Chaitanya Kumar Borah
2026-11-19 17:36 ` sashiko-bot
2026-11-19 23:34 ` ✓ i915.CI.BAT: success for " Patchwork

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