drm/i915/edp: enable eDP MSO during link training

If the source and sink support MSO, enable it during link training.

v4: Divide DRRS pixel clock by link count before M/N calculation

v3: Adjust timings, refer to splitter

v2: Limit MSO to pipe A using ->pipe_mask

Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/2711
Cc: Nischal Varide <nischal.varide@intel.com>
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/66da48b4b3c5ccffaac7989097cd96d6c6af8243.1614682842.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index d4cfe7e85538f2ffd8dead983318698ea53543e4..549e4399a0c217a51f4d64d1bd5f040f5c5dca05 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -2175,6 +2175,34 @@ static void intel_ddi_mso_get_config(struct intel_encoder *encoder,
        pipe_config->splitter.pixel_overlap = REG_FIELD_GET(OVERLAP_PIXELS_MASK, dss1);
 }
 
+static void intel_ddi_mso_configure(const struct intel_crtc_state *crtc_state)
+{
+       struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
+       struct drm_i915_private *i915 = to_i915(crtc->base.dev);
+       enum pipe pipe = crtc->pipe;
+       u32 dss1 = 0;
+
+       if (!HAS_MSO(i915))
+               return;
+
+       if (crtc_state->splitter.enable) {
+               /* Splitter enable is supported for pipe A only. */
+               if (drm_WARN_ON(&i915->drm, pipe != PIPE_A))
+                       return;
+
+               dss1 |= SPLITTER_ENABLE;
+               dss1 |= OVERLAP_PIXELS(crtc_state->splitter.pixel_overlap);
+               if (crtc_state->splitter.link_count == 2)
+                       dss1 |= SPLITTER_CONFIGURATION_2_SEGMENT;
+               else
+                       dss1 |= SPLITTER_CONFIGURATION_4_SEGMENT;
+       }
+
+       intel_de_rmw(i915, ICL_PIPE_DSS_CTL1(pipe),
+                    SPLITTER_ENABLE | SPLITTER_CONFIGURATION_MASK |
+                    OVERLAP_PIXELS_MASK, dss1);
+}
+
 static void tgl_ddi_pre_enable_dp(struct intel_atomic_state *state,
                                  struct intel_encoder *encoder,
                                  const struct intel_crtc_state *crtc_state,
@@ -2268,6 +2296,11 @@ static void tgl_ddi_pre_enable_dp(struct intel_atomic_state *state,
         */
        intel_ddi_power_up_lanes(encoder, crtc_state);
 
+       /*
+        * 7.g Program CoG/MSO configuration bits in DSS_CTL1 if selected.
+        */
+       intel_ddi_mso_configure(crtc_state);
+
        /*
         * 7.g Configure and enable DDI_BUF_CTL
         * 7.h Wait for DDI_BUF_CTL DDI Idle Status = 0b (Not Idle), timeout
@@ -4200,6 +4233,10 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
                        goto err;
 
                dig_port->hpd_pulse = intel_dp_hpd_pulse;
+
+               /* Splitter enable for eDP MSO is supported for pipe A only. */
+               if (dig_port->dp.mso_link_count)
+                       encoder->pipe_mask = BIT(PIPE_A);
        }
 
        /* In theory we don't need the encoder->type check, but leave it just in

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 7a243a96d6efc73dfad9860b91af34954a3d69cb..39e8ab1408b6712224723a225e09e2b7c7bdeeb8 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -4923,6 +4923,19 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,
                pipe_config->pipe_src_w /= 2;
        }
 
+       if (pipe_config->splitter.enable) {
+               int n = pipe_config->splitter.link_count;
+               int overlap = pipe_config->splitter.pixel_overlap;
+
+               pipe_mode->crtc_hdisplay = (pipe_mode->crtc_hdisplay - overlap) * n;
+               pipe_mode->crtc_hblank_start = (pipe_mode->crtc_hblank_start - overlap) * n;
+               pipe_mode->crtc_hblank_end = (pipe_mode->crtc_hblank_end - overlap) * n;
+               pipe_mode->crtc_hsync_start = (pipe_mode->crtc_hsync_start - overlap) * n;
+               pipe_mode->crtc_hsync_end = (pipe_mode->crtc_hsync_end - overlap) * n;
+               pipe_mode->crtc_htotal = (pipe_mode->crtc_htotal - overlap) * n;
+               pipe_mode->crtc_clock *= n;
+       }
+
        intel_mode_from_crtc_timings(pipe_mode, pipe_mode);
 
        if (INTEL_GEN(dev_priv) < 4) {

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 2d0001e7c26a2582455a6a481780bc2ae98ac3bf..b6b5776f5a66896733dd558df8732c90791bc6d3 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -1723,6 +1723,7 @@ intel_dp_drrs_compute_config(struct intel_dp *intel_dp,
 {
        struct intel_connector *intel_connector = intel_dp->attached_connector;
        struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
+       int pixel_clock;
 
        if (pipe_config->vrr.enable)
                return;
@@ -1741,10 +1742,18 @@ intel_dp_drrs_compute_config(struct intel_dp *intel_dp,
                return;
 
        pipe_config->has_drrs = true;
-       intel_link_compute_m_n(output_bpp, pipe_config->lane_count,
-                              intel_connector->panel.downclock_mode->clock,
+
+       pixel_clock = intel_connector->panel.downclock_mode->clock;
+       if (pipe_config->splitter.enable)
+               pixel_clock /= pipe_config->splitter.link_count;
+
+       intel_link_compute_m_n(output_bpp, pipe_config->lane_count, pixel_clock,
                               pipe_config->port_clock, &pipe_config->dp_m2_n2,
                               constant_n, pipe_config->fec_enable);
+
+       /* FIXME: abstract this better */
+       if (pipe_config->splitter.enable)
+               pipe_config->dp_m2_n2.gmch_m *= pipe_config->splitter.link_count;
 }
 
 int
@@ -1819,6 +1828,26 @@ intel_dp_compute_config(struct intel_encoder *encoder,
                output_bpp = intel_dp_output_bpp(pipe_config->output_format,
                                                 pipe_config->pipe_bpp);
 
+       if (intel_dp->mso_link_count) {
+               int n = intel_dp->mso_link_count;
+               int overlap = intel_dp->mso_pixel_overlap;
+
+               pipe_config->splitter.enable = true;
+               pipe_config->splitter.link_count = n;
+               pipe_config->splitter.pixel_overlap = overlap;
+
+               drm_dbg_kms(&dev_priv->drm, "MSO link count %d, pixel overlap %d\n",
+                           n, overlap);
+
+               adjusted_mode->crtc_hdisplay = adjusted_mode->crtc_hdisplay / n + overlap;
+               adjusted_mode->crtc_hblank_start = adjusted_mode->crtc_hblank_start / n + overlap;
+               adjusted_mode->crtc_hblank_end = adjusted_mode->crtc_hblank_end / n + overlap;
+               adjusted_mode->crtc_hsync_start = adjusted_mode->crtc_hsync_start / n + overlap;
+               adjusted_mode->crtc_hsync_end = adjusted_mode->crtc_hsync_end / n + overlap;
+               adjusted_mode->crtc_htotal = adjusted_mode->crtc_htotal / n + overlap;
+               adjusted_mode->crtc_clock /= n;
+       }
+
        intel_link_compute_m_n(output_bpp,
                               pipe_config->lane_count,
                               adjusted_mode->crtc_clock,
@@ -1826,6 +1855,10 @@ intel_dp_compute_config(struct intel_encoder *encoder,
                               &pipe_config->dp_m_n,
                               constant_n, pipe_config->fec_enable);
 
+       /* FIXME: abstract this better */
+       if (pipe_config->splitter.enable)
+               pipe_config->dp_m_n.gmch_m *= pipe_config->splitter.link_count;
+
        if (!HAS_DDI(dev_priv))
                intel_dp_set_clock(encoder, pipe_config);
 
@@ -3564,8 +3597,10 @@ static void intel_edp_mso_init(struct intel_dp *intel_dp)
        if (mso) {
                drm_dbg_kms(&i915->drm, "Sink MSO %ux%u configuration\n",
                            mso, drm_dp_max_lane_count(intel_dp->dpcd) / mso);
-               drm_err(&i915->drm, "No source MSO support, disabling\n");
-               mso = 0;
+               if (!HAS_MSO(i915)) {
+                       drm_err(&i915->drm, "No source MSO support, disabling\n");
+                       mso = 0;
+               }
        }
 
        intel_dp->mso_link_count = mso;