drm/i915/bigjoiner: atomic commit changes for uncompressed joiner

Respective bit for master or slave to be set for uncompressed
bigjoiner in dss_ctl1 register.

Cc: Manasi Navare <manasi.d.navare@intel.com>
Signed-off-by: Animesh Manna <animesh.manna@intel.com>
Signed-off-by: Clinton Taylor <Clinton.A.Taylor@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210514153711.2359617-16-matthew.d.roper@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 2abd6bd0969fd11a80b7d7330dfea02d5c87d016..93d6a6faa95db7ee361c6bd8872cccdb18d359ea 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -3411,6 +3411,7 @@ static void icl_ddi_bigjoiner_pre_enable(struct intel_atomic_state *state,
                                         const struct intel_crtc_state *crtc_state)
 {
        struct intel_crtc *master = to_intel_crtc(crtc_state->uapi.crtc);
+       struct drm_i915_private *dev_priv = to_i915(master->base.dev);
        struct intel_crtc_state *master_crtc_state;
        struct drm_connector_state *conn_state;
        struct drm_connector *conn;
@@ -3444,6 +3445,9 @@ static void icl_ddi_bigjoiner_pre_enable(struct intel_atomic_state *state,
                /* and DSC on slave */
                intel_dsc_enable(NULL, crtc_state);
        }
+
+       if (DISPLAY_VER(dev_priv) >= 13)
+               intel_uncompressed_joiner_enable(crtc_state);
 }
 
 static void hsw_crtc_enable(struct intel_atomic_state *state,
@@ -6250,6 +6254,8 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc,
        }
 
        intel_dsc_get_config(pipe_config);
+       if (DISPLAY_VER(dev_priv) >= 13 && !pipe_config->dsc.compression_enable)
+               intel_uncompressed_joiner_get_config(pipe_config);
 
        if (!active) {
                /* bigjoiner slave doesn't enable transcoder */

diff --git a/drivers/gpu/drm/i915/display/intel_vdsc.c b/drivers/gpu/drm/i915/display/intel_vdsc.c
index adcd6752f9191783328f66cfbc7d0c49a08aa99f..efc3184d8315b2f27b434164ee1f7d65e0edf119 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_vdsc.c
+++ b/drivers/gpu/drm/i915/display/intel_vdsc.c
@@ -1021,6 +1021,22 @@ static i915_reg_t dss_ctl2_reg(const struct intel_crtc_state *crtc_state)
        return is_pipe_dsc(crtc_state) ? ICL_PIPE_DSS_CTL2(pipe) : DSS_CTL2;
 }
 
+void intel_uncompressed_joiner_enable(const struct intel_crtc_state *crtc_state)
+{
+       struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
+       struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
+       u32 dss_ctl1_val = 0;
+
+       if (crtc_state->bigjoiner && !crtc_state->dsc.compression_enable) {
+               if (crtc_state->bigjoiner_slave)
+                       dss_ctl1_val |= UNCOMPRESSED_JOINER_SLAVE;
+               else
+                       dss_ctl1_val |= UNCOMPRESSED_JOINER_MASTER;
+
+               intel_de_write(dev_priv, dss_ctl1_reg(crtc_state), dss_ctl1_val);
+       }
+}
+
 void intel_dsc_enable(struct intel_encoder *encoder,
                      const struct intel_crtc_state *crtc_state)
 {
@@ -1060,13 +1076,35 @@ void intel_dsc_disable(const struct intel_crtc_state *old_crtc_state)
        struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);
        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
 
-       if (!old_crtc_state->dsc.compression_enable)
+       if (!(old_crtc_state->dsc.compression_enable &&
+             old_crtc_state->bigjoiner))
                return;
 
        intel_de_write(dev_priv, dss_ctl1_reg(old_crtc_state), 0);
        intel_de_write(dev_priv, dss_ctl2_reg(old_crtc_state), 0);
 }
 
+void intel_uncompressed_joiner_get_config(struct intel_crtc_state *crtc_state)
+{
+       struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
+       struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
+       u32 dss_ctl1;
+
+       dss_ctl1 = intel_de_read(dev_priv, dss_ctl1_reg(crtc_state));
+       if (dss_ctl1 & UNCOMPRESSED_JOINER_MASTER) {
+               crtc_state->bigjoiner = true;
+               if (!WARN_ON(INTEL_NUM_PIPES(dev_priv) == crtc->pipe + 1))
+                       crtc_state->bigjoiner_linked_crtc =
+                               intel_get_crtc_for_pipe(dev_priv, crtc->pipe + 1);
+       } else if (dss_ctl1 & UNCOMPRESSED_JOINER_SLAVE) {
+               crtc_state->bigjoiner = true;
+               crtc_state->bigjoiner_slave = true;
+               if (!WARN_ON(crtc->pipe == PIPE_A))
+                       crtc_state->bigjoiner_linked_crtc =
+                               intel_get_crtc_for_pipe(dev_priv, crtc->pipe - 1);
+       }
+}
+
 void intel_dsc_get_config(struct intel_crtc_state *crtc_state)
 {
        struct drm_dsc_config *vdsc_cfg = &crtc_state->dsc.config;

diff --git a/drivers/gpu/drm/i915/display/intel_vdsc.h b/drivers/gpu/drm/i915/display/intel_vdsc.h
index 65d301c23580752d1bb0c2fe2ce0f0d08a4e22b7..fe4d455612532ce4e3310ba00f67b866b1126970 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_vdsc.h
+++ b/drivers/gpu/drm/i915/display/intel_vdsc.h
@@ -12,11 +12,13 @@ struct intel_encoder;
 struct intel_crtc_state;
 
 bool intel_dsc_source_support(const struct intel_crtc_state *crtc_state);
+void intel_uncompressed_joiner_enable(const struct intel_crtc_state *crtc_state);
 void intel_dsc_enable(struct intel_encoder *encoder,
                      const struct intel_crtc_state *crtc_state);
 void intel_dsc_disable(const struct intel_crtc_state *crtc_state);
 int intel_dsc_compute_params(struct intel_encoder *encoder,
                             struct intel_crtc_state *pipe_config);
+void intel_uncompressed_joiner_get_config(struct intel_crtc_state *crtc_state);
 void intel_dsc_get_config(struct intel_crtc_state *crtc_state);
 enum intel_display_power_domain
 intel_dsc_power_domain(const struct intel_crtc_state *crtc_state);

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 1ec0f0ac8e39557594616d182f8403bf253ecbc7..349cf953c689e40c8316fe44e709a071154dcfbf 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -11487,6 +11487,8 @@ enum skl_power_gate {
 #define  SPLITTER_CONFIGURATION_MASK           REG_GENMASK(26, 25)
 #define  SPLITTER_CONFIGURATION_2_SEGMENT      REG_FIELD_PREP(SPLITTER_CONFIGURATION_MASK, 0)
 #define  SPLITTER_CONFIGURATION_4_SEGMENT      REG_FIELD_PREP(SPLITTER_CONFIGURATION_MASK, 1)
+#define  UNCOMPRESSED_JOINER_MASTER            (1 << 21)
+#define  UNCOMPRESSED_JOINER_SLAVE             (1 << 20)
 
 #define _ICL_PIPE_DSS_CTL2_PB                  0x78204
 #define _ICL_PIPE_DSS_CTL2_PC                  0x78404