drm/i915/color: Enable Plane Color Pipelines

Expose color pipeline and add ability to program it.

v2: Set bit to enable multisegmented lut
v3: s/drm_color_lut_32/drm_color_lut32 (Simon)
v4: - Fix dsb programming
    - Remove multi-segment LUT, they will be added in later patches
    - Add pipeline only to TGL+
    - Code Refactor

Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com>
Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patch.msgid.link/20251203085211.3663374-16-uma.shankar@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 069967114bd992ed92e39318ec5c9d48c00458ad..808ac34c1914a755a8b7fafd4321b6ffc975aafb 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -7296,6 +7296,7 @@ static void intel_atomic_dsb_finish(struct intel_atomic_state *state,
        struct intel_display *display = to_intel_display(state);
        struct intel_crtc_state *new_crtc_state =
                intel_atomic_get_new_crtc_state(state, crtc);
+       unsigned int size = new_crtc_state->plane_color_changed ? 8192 : 1024;
 
        if (!new_crtc_state->use_flipq &&
            !new_crtc_state->use_dsb &&
@@ -7306,10 +7307,12 @@ static void intel_atomic_dsb_finish(struct intel_atomic_state *state,
         * Rough estimate:
         * ~64 registers per each plane * 8 planes = 512
         * Double that for pipe stuff and other overhead.
+        * ~4913 registers for 3DLUT
+        * ~200 color registers * 3 HDR planes
         */
        new_crtc_state->dsb_commit = intel_dsb_prepare(state, crtc, INTEL_DSB_0,
                                                       new_crtc_state->use_dsb ||
-                                                      new_crtc_state->use_flipq ? 1024 : 16);
+                                                      new_crtc_state->use_flipq ? size : 16);
        if (!new_crtc_state->dsb_commit) {
                new_crtc_state->use_flipq = false;
                new_crtc_state->use_dsb = false;

diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 89c8003ccfe75c0d057fd6e72307d966300a70b1..ee8e24497d2cfd85100e3f85d76562e4012e55d6 100644 (file)
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -11,6 +11,8 @@
 
 #include "pxp/intel_pxp.h"
 #include "intel_bo.h"
+#include "intel_color.h"
+#include "intel_color_pipeline.h"
 #include "intel_de.h"
 #include "intel_display_irq.h"
 #include "intel_display_regs.h"
@@ -1275,6 +1277,18 @@ static u32 glk_plane_color_ctl(const struct intel_plane_state *plane_state)
        if (plane_state->force_black)
                plane_color_ctl |= PLANE_COLOR_PLANE_CSC_ENABLE;
 
+       if (plane_state->hw.degamma_lut)
+               plane_color_ctl |= PLANE_COLOR_PRE_CSC_GAMMA_ENABLE;
+
+       if (plane_state->hw.ctm)
+               plane_color_ctl |= PLANE_COLOR_PLANE_CSC_ENABLE;
+
+       if (plane_state->hw.gamma_lut) {
+               plane_color_ctl &= ~PLANE_COLOR_PLANE_GAMMA_DISABLE;
+               if (drm_color_lut32_size(plane_state->hw.gamma_lut) != 32)
+                       plane_color_ctl |= PLANE_COLOR_POST_CSC_GAMMA_MULTSEG_ENABLE;
+       }
+
        return plane_color_ctl;
 }
 
@@ -1556,6 +1570,8 @@ icl_plane_update_noarm(struct intel_dsb *dsb,
        plane_color_ctl = plane_state->color_ctl |
                glk_plane_color_ctl_crtc(crtc_state);
 
+       intel_color_plane_program_pipeline(dsb, plane_state);
+
        /* The scaler will handle the output position */
        if (plane_state->scaler_id >= 0) {
                crtc_x = 0;
@@ -1657,6 +1673,8 @@ icl_plane_update_arm(struct intel_dsb *dsb,
 
        icl_plane_update_sel_fetch_arm(dsb, plane, crtc_state, plane_state);
 
+       intel_color_plane_commit_arm(dsb, plane_state);
+
        /*
         * In order to have FBC for fp16 formats pixel normalizer block must be
         * active. Check if pixel normalizer block need to be enabled for FBC.
@@ -3001,6 +3019,9 @@ skl_universal_plane_create(struct intel_display *display,
                                          DRM_COLOR_YCBCR_BT709,
                                          DRM_COLOR_YCBCR_LIMITED_RANGE);
 
+       if (DISPLAY_VER(display) >= 12)
+               intel_color_pipeline_plane_init(&plane->base, pipe);
+
        drm_plane_create_alpha_property(&plane->base);
        drm_plane_create_blend_mode_property(&plane->base,
                                             BIT(DRM_MODE_BLEND_PIXEL_NONE) |