drm/i915/icl: Enable pipe output csc

GEN11+ onwards an output csc hardware block has been added.
This is after the pipe gamma block and is in addition to the
legacy pipe CSC block. Primary use case for this block is to
convert RGB to YUV in case sink supports YUV.
This patch adds supports for the same.

v2: This is added after splitting the existing ICL pipe CSC
handling. As per Matt's suggestion, made this to co-exist
with existing pipe CSC, wherein both can be enabled if a
certain usecase arises.

v3: Fixed an issue with co-existence of output csc and normal
pipe csc, spotted by Matt. Put the csc mode flag enabling to
color_check to align with atomic.

v4: Fixed macro alignment and checkpatch complaints wrt line over
100 characters limit.

Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1549893025-21837-5-git-send-email-uma.shankar@intel.com

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 4cb0013f43f66c6ca5bb08c540ca030695e8b396..668e862d5ddce648ed5cb124c234021c69999326 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -9888,6 +9888,7 @@ enum skl_power_gate {
 
 #define _PIPE_A_CSC_MODE       0x49028
 #define  ICL_CSC_ENABLE                        (1 << 31)
+#define  ICL_OUTPUT_CSC_ENABLE         (1 << 30)
 #define  CSC_BLACK_SCREEN_OFFSET       (1 << 2)
 #define  CSC_POSITION_BEFORE_GAMMA     (1 << 1)
 #define  CSC_MODE_YUV_TO_RGB           (1 << 0)
@@ -9927,6 +9928,70 @@ enum skl_power_gate {
 #define PIPE_CSC_POSTOFF_ME(pipe)      _MMIO_PIPE(pipe, _PIPE_A_CSC_POSTOFF_ME, _PIPE_B_CSC_POSTOFF_ME)
 #define PIPE_CSC_POSTOFF_LO(pipe)      _MMIO_PIPE(pipe, _PIPE_A_CSC_POSTOFF_LO, _PIPE_B_CSC_POSTOFF_LO)
 
+/* Pipe Output CSC */
+#define _PIPE_A_OUTPUT_CSC_COEFF_RY_GY 0x49050
+#define _PIPE_A_OUTPUT_CSC_COEFF_BY    0x49054
+#define _PIPE_A_OUTPUT_CSC_COEFF_RU_GU 0x49058
+#define _PIPE_A_OUTPUT_CSC_COEFF_BU    0x4905c
+#define _PIPE_A_OUTPUT_CSC_COEFF_RV_GV 0x49060
+#define _PIPE_A_OUTPUT_CSC_COEFF_BV    0x49064
+#define _PIPE_A_OUTPUT_CSC_PREOFF_HI   0x49068
+#define _PIPE_A_OUTPUT_CSC_PREOFF_ME   0x4906c
+#define _PIPE_A_OUTPUT_CSC_PREOFF_LO   0x49070
+#define _PIPE_A_OUTPUT_CSC_POSTOFF_HI  0x49074
+#define _PIPE_A_OUTPUT_CSC_POSTOFF_ME  0x49078
+#define _PIPE_A_OUTPUT_CSC_POSTOFF_LO  0x4907c
+
+#define _PIPE_B_OUTPUT_CSC_COEFF_RY_GY 0x49150
+#define _PIPE_B_OUTPUT_CSC_COEFF_BY    0x49154
+#define _PIPE_B_OUTPUT_CSC_COEFF_RU_GU 0x49158
+#define _PIPE_B_OUTPUT_CSC_COEFF_BU    0x4915c
+#define _PIPE_B_OUTPUT_CSC_COEFF_RV_GV 0x49160
+#define _PIPE_B_OUTPUT_CSC_COEFF_BV    0x49164
+#define _PIPE_B_OUTPUT_CSC_PREOFF_HI   0x49168
+#define _PIPE_B_OUTPUT_CSC_PREOFF_ME   0x4916c
+#define _PIPE_B_OUTPUT_CSC_PREOFF_LO   0x49170
+#define _PIPE_B_OUTPUT_CSC_POSTOFF_HI  0x49174
+#define _PIPE_B_OUTPUT_CSC_POSTOFF_ME  0x49178
+#define _PIPE_B_OUTPUT_CSC_POSTOFF_LO  0x4917c
+
+#define PIPE_CSC_OUTPUT_COEFF_RY_GY(pipe)      _MMIO_PIPE(pipe,\
+                                                          _PIPE_A_OUTPUT_CSC_COEFF_RY_GY,\
+                                                          _PIPE_B_OUTPUT_CSC_COEFF_RY_GY)
+#define PIPE_CSC_OUTPUT_COEFF_BY(pipe)         _MMIO_PIPE(pipe, \
+                                                          _PIPE_A_OUTPUT_CSC_COEFF_BY, \
+                                                          _PIPE_B_OUTPUT_CSC_COEFF_BY)
+#define PIPE_CSC_OUTPUT_COEFF_RU_GU(pipe)      _MMIO_PIPE(pipe, \
+                                                          _PIPE_A_OUTPUT_CSC_COEFF_RU_GU, \
+                                                          _PIPE_B_OUTPUT_CSC_COEFF_RU_GU)
+#define PIPE_CSC_OUTPUT_COEFF_BU(pipe)         _MMIO_PIPE(pipe, \
+                                                          _PIPE_A_OUTPUT_CSC_COEFF_BU, \
+                                                          _PIPE_B_OUTPUT_CSC_COEFF_BU)
+#define PIPE_CSC_OUTPUT_COEFF_RV_GV(pipe)      _MMIO_PIPE(pipe, \
+                                                          _PIPE_A_OUTPUT_CSC_COEFF_RV_GV, \
+                                                          _PIPE_B_OUTPUT_CSC_COEFF_RV_GV)
+#define PIPE_CSC_OUTPUT_COEFF_BV(pipe)         _MMIO_PIPE(pipe, \
+                                                          _PIPE_A_OUTPUT_CSC_COEFF_BV, \
+                                                          _PIPE_B_OUTPUT_CSC_COEFF_BV)
+#define PIPE_CSC_OUTPUT_PREOFF_HI(pipe)                _MMIO_PIPE(pipe, \
+                                                          _PIPE_A_OUTPUT_CSC_PREOFF_HI, \
+                                                          _PIPE_B_OUTPUT_CSC_PREOFF_HI)
+#define PIPE_CSC_OUTPUT_PREOFF_ME(pipe)                _MMIO_PIPE(pipe, \
+                                                          _PIPE_A_OUTPUT_CSC_PREOFF_ME, \
+                                                          _PIPE_B_OUTPUT_CSC_PREOFF_ME)
+#define PIPE_CSC_OUTPUT_PREOFF_LO(pipe)                _MMIO_PIPE(pipe, \
+                                                          _PIPE_A_OUTPUT_CSC_PREOFF_LO, \
+                                                          _PIPE_B_OUTPUT_CSC_PREOFF_LO)
+#define PIPE_CSC_OUTPUT_POSTOFF_HI(pipe)       _MMIO_PIPE(pipe, \
+                                                          _PIPE_A_OUTPUT_CSC_POSTOFF_HI, \
+                                                          _PIPE_B_OUTPUT_CSC_POSTOFF_HI)
+#define PIPE_CSC_OUTPUT_POSTOFF_ME(pipe)       _MMIO_PIPE(pipe, \
+                                                          _PIPE_A_OUTPUT_CSC_POSTOFF_ME, \
+                                                          _PIPE_B_OUTPUT_CSC_POSTOFF_ME)
+#define PIPE_CSC_OUTPUT_POSTOFF_LO(pipe)       _MMIO_PIPE(pipe, \
+                                                          _PIPE_A_OUTPUT_CSC_POSTOFF_LO, \
+                                                          _PIPE_B_OUTPUT_CSC_POSTOFF_LO)
+
 /* pipe degamma/gamma LUTs on IVB+ */
 #define _PAL_PREC_INDEX_A      0x4A400
 #define _PAL_PREC_INDEX_B      0x4AC00

diff --git a/drivers/gpu/drm/i915/intel_color.c b/drivers/gpu/drm/i915/intel_color.c
index 395b475c57ce8d4a448a99d917510f160ae582f6..da7a07d5cceaf4100dc4118be37acfa882a3ba9e 100644 (file)
--- a/drivers/gpu/drm/i915/intel_color.c
+++ b/drivers/gpu/drm/i915/intel_color.c
@@ -118,23 +118,47 @@ static void ilk_load_ycbcr_conversion_matrix(struct intel_crtc *crtc)
        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
        enum pipe pipe = crtc->pipe;
 
-       I915_WRITE(PIPE_CSC_PREOFF_HI(pipe), 0);
-       I915_WRITE(PIPE_CSC_PREOFF_ME(pipe), 0);
-       I915_WRITE(PIPE_CSC_PREOFF_LO(pipe), 0);
+       if (INTEL_GEN(dev_priv) < 11) {
+               I915_WRITE(PIPE_CSC_PREOFF_HI(pipe), 0);
+               I915_WRITE(PIPE_CSC_PREOFF_ME(pipe), 0);
+               I915_WRITE(PIPE_CSC_PREOFF_LO(pipe), 0);
 
-       I915_WRITE(PIPE_CSC_COEFF_RU_GU(pipe), CSC_RGB_TO_YUV_RU_GU);
-       I915_WRITE(PIPE_CSC_COEFF_BU(pipe), CSC_RGB_TO_YUV_BU);
+               I915_WRITE(PIPE_CSC_COEFF_RU_GU(pipe), CSC_RGB_TO_YUV_RU_GU);
+               I915_WRITE(PIPE_CSC_COEFF_BU(pipe), CSC_RGB_TO_YUV_BU);
 
-       I915_WRITE(PIPE_CSC_COEFF_RY_GY(pipe), CSC_RGB_TO_YUV_RY_GY);
-       I915_WRITE(PIPE_CSC_COEFF_BY(pipe), CSC_RGB_TO_YUV_BY);
+               I915_WRITE(PIPE_CSC_COEFF_RY_GY(pipe), CSC_RGB_TO_YUV_RY_GY);
+               I915_WRITE(PIPE_CSC_COEFF_BY(pipe), CSC_RGB_TO_YUV_BY);
 
-       I915_WRITE(PIPE_CSC_COEFF_RV_GV(pipe), CSC_RGB_TO_YUV_RV_GV);
-       I915_WRITE(PIPE_CSC_COEFF_BV(pipe), CSC_RGB_TO_YUV_BV);
+               I915_WRITE(PIPE_CSC_COEFF_RV_GV(pipe), CSC_RGB_TO_YUV_RV_GV);
+               I915_WRITE(PIPE_CSC_COEFF_BV(pipe), CSC_RGB_TO_YUV_BV);
 
-       I915_WRITE(PIPE_CSC_POSTOFF_HI(pipe), POSTOFF_RGB_TO_YUV_HI);
-       I915_WRITE(PIPE_CSC_POSTOFF_ME(pipe), POSTOFF_RGB_TO_YUV_ME);
-       I915_WRITE(PIPE_CSC_POSTOFF_LO(pipe), POSTOFF_RGB_TO_YUV_LO);
-       I915_WRITE(PIPE_CSC_MODE(pipe), 0);
+               I915_WRITE(PIPE_CSC_POSTOFF_HI(pipe), POSTOFF_RGB_TO_YUV_HI);
+               I915_WRITE(PIPE_CSC_POSTOFF_ME(pipe), POSTOFF_RGB_TO_YUV_ME);
+               I915_WRITE(PIPE_CSC_POSTOFF_LO(pipe), POSTOFF_RGB_TO_YUV_LO);
+       } else {
+               I915_WRITE(PIPE_CSC_OUTPUT_PREOFF_HI(pipe), 0);
+               I915_WRITE(PIPE_CSC_OUTPUT_PREOFF_ME(pipe), 0);
+               I915_WRITE(PIPE_CSC_OUTPUT_PREOFF_LO(pipe), 0);
+
+               I915_WRITE(PIPE_CSC_OUTPUT_COEFF_RU_GU(pipe),
+                          CSC_RGB_TO_YUV_RU_GU);
+               I915_WRITE(PIPE_CSC_OUTPUT_COEFF_BU(pipe), CSC_RGB_TO_YUV_BU);
+
+               I915_WRITE(PIPE_CSC_OUTPUT_COEFF_RY_GY(pipe),
+                          CSC_RGB_TO_YUV_RY_GY);
+               I915_WRITE(PIPE_CSC_OUTPUT_COEFF_BY(pipe), CSC_RGB_TO_YUV_BY);
+
+               I915_WRITE(PIPE_CSC_OUTPUT_COEFF_RV_GV(pipe),
+                          CSC_RGB_TO_YUV_RV_GV);
+               I915_WRITE(PIPE_CSC_OUTPUT_COEFF_BV(pipe), CSC_RGB_TO_YUV_BV);
+
+               I915_WRITE(PIPE_CSC_OUTPUT_POSTOFF_HI(pipe),
+                          POSTOFF_RGB_TO_YUV_HI);
+               I915_WRITE(PIPE_CSC_OUTPUT_POSTOFF_ME(pipe),
+                          POSTOFF_RGB_TO_YUV_ME);
+               I915_WRITE(PIPE_CSC_OUTPUT_POSTOFF_LO(pipe),
+                          POSTOFF_RGB_TO_YUV_LO);
+       }
 }
 
 static void ilk_load_csc_matrix(const struct intel_crtc_state *crtc_state)
@@ -156,8 +180,16 @@ static void ilk_load_csc_matrix(const struct intel_crtc_state *crtc_state)
        if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 ||
            crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR444) {
                ilk_load_ycbcr_conversion_matrix(crtc);
-               return;
-       } else if (crtc_state->base.ctm) {
+               I915_WRITE(PIPE_CSC_MODE(pipe), crtc_state->csc_mode);
+               /*
+                * On pre GEN11 output CSC is not there, so with 1 pipe CSC
+                * RGB to YUV conversion can be done. No need to go further
+                */
+               if (INTEL_GEN(dev_priv) < 11)
+                       return;
+       }
+
+       if (crtc_state->base.ctm) {
                struct drm_color_ctm *ctm = crtc_state->base.ctm->data;
                const u64 *input;
                u64 temp[9];
@@ -243,10 +275,7 @@ static void ilk_load_csc_matrix(const struct intel_crtc_state *crtc_state)
                I915_WRITE(PIPE_CSC_POSTOFF_ME(pipe), postoff);
                I915_WRITE(PIPE_CSC_POSTOFF_LO(pipe), postoff);
 
-               if (INTEL_GEN(dev_priv) >= 11)
-                       I915_WRITE(PIPE_CSC_MODE(pipe), ICL_CSC_ENABLE);
-               else
-                       I915_WRITE(PIPE_CSC_MODE(pipe), 0);
+               I915_WRITE(PIPE_CSC_MODE(pipe), crtc_state->csc_mode);
        } else {
                u32 mode = CSC_MODE_YUV_TO_RGB;
 
@@ -785,6 +814,16 @@ int intel_color_check(struct intel_crtc_state *crtc_state)
        else
                crtc_state->gamma_mode = GAMMA_MODE_MODE_8BIT;
 
+       crtc_state->csc_mode = 0;
+
+       if (INTEL_GEN(dev_priv) >= 11) {
+               if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 ||
+                   crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR444)
+                       crtc_state->csc_mode |= ICL_OUTPUT_CSC_ENABLE;
+
+               crtc_state->csc_mode |= ICL_CSC_ENABLE;
+       }
+
        return 0;
 }
 

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 96fb830391dd3e09c0c401270f43072a36f0640c..dd121966613b00da02eb668c7632df833e8bc4ff 100644 (file)
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -941,6 +941,9 @@ struct intel_crtc_state {
        /* Gamma mode programmed on the pipe */
        u32 gamma_mode;
 
+       /* CSC mode programmed on the pipe */
+       u32 csc_mode;
+
        /* bitmask of visible planes (enum plane_id) */
        u8 active_planes;
        u8 nv12_planes;