drm/i915: Pass connector to intel_dp_need_bigjoiner()

Pass the connector explicitly to intel_dp_need_bigjoiner()
so that it'll actually check the correct place for the
bigjoiner force flag.

Tested-by: Vidya Srinivas <vidya.srinivas@intel.com>
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240404213441.17637-11-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 9654b2404bc089abc8c8a1dbe47d049c84326de3..163da48bc4065660b2e702b343bbef8c686cba4e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -1202,10 +1202,10 @@ intel_dp_mode_valid_downstream(struct intel_connector *connector,
 }
 
 bool intel_dp_need_bigjoiner(struct intel_dp *intel_dp,
+                            struct intel_connector *connector,
                             int hdisplay, int clock)
 {
        struct drm_i915_private *i915 = dp_to_i915(intel_dp);
-       struct intel_connector *connector = intel_dp->attached_connector;
 
        if (!intel_dp_has_bigjoiner(intel_dp))
                return false;
@@ -1249,7 +1249,8 @@ intel_dp_mode_valid(struct drm_connector *_connector,
                target_clock = fixed_mode->clock;
        }
 
-       if (intel_dp_need_bigjoiner(intel_dp, mode->hdisplay, target_clock)) {
+       if (intel_dp_need_bigjoiner(intel_dp, connector,
+                                   mode->hdisplay, target_clock)) {
                bigjoiner = true;
                max_dotclk *= 2;
        }
@@ -2419,7 +2420,7 @@ intel_dp_compute_link_config(struct intel_encoder *encoder,
 {
        struct drm_i915_private *i915 = to_i915(encoder->base.dev);
        struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc);
-       const struct intel_connector *connector =
+       struct intel_connector *connector =
                to_intel_connector(conn_state->connector);
        const struct drm_display_mode *adjusted_mode =
                &pipe_config->hw.adjusted_mode;
@@ -2432,7 +2433,8 @@ intel_dp_compute_link_config(struct intel_encoder *encoder,
            !intel_dp_supports_fec(intel_dp, connector, pipe_config))
                return -EINVAL;
 
-       if (intel_dp_need_bigjoiner(intel_dp, adjusted_mode->crtc_hdisplay,
+       if (intel_dp_need_bigjoiner(intel_dp, connector,
+                                   adjusted_mode->crtc_hdisplay,
                                    adjusted_mode->crtc_clock))
                pipe_config->bigjoiner_pipes = GENMASK(crtc->pipe + 1, crtc->pipe);
 

diff --git a/drivers/gpu/drm/i915/display/intel_dp.h b/drivers/gpu/drm/i915/display/intel_dp.h
index 9f6be562fa08df96112877d1350fe8f8d2d8d4f9..106ecfde36d9a2e90b012e4b7f6734ad563053c5 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.h
+++ b/drivers/gpu/drm/i915/display/intel_dp.h
@@ -151,6 +151,7 @@ u8 intel_dp_dsc_get_slice_count(const struct intel_connector *connector,
                                int mode_clock, int mode_hdisplay,
                                bool bigjoiner);
 bool intel_dp_need_bigjoiner(struct intel_dp *intel_dp,
+                            struct intel_connector *connector,
                             int hdisplay, int clock);
 
 static inline unsigned int intel_dp_unused_lane_mask(int lane_count)

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index a665a165a8317e51518870620841c20118edb5c8..b4d663703e72daa06177773124896c2599ff7f96 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -527,7 +527,7 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder,
        struct intel_atomic_state *state = to_intel_atomic_state(conn_state->state);
        struct intel_dp_mst_encoder *intel_mst = enc_to_mst(encoder);
        struct intel_dp *intel_dp = &intel_mst->primary->dp;
-       const struct intel_connector *connector =
+       struct intel_connector *connector =
                to_intel_connector(conn_state->connector);
        const struct drm_display_mode *adjusted_mode =
                &pipe_config->hw.adjusted_mode;
@@ -1342,7 +1342,8 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector,
                *status = MODE_CLOCK_HIGH;
                return 0;
        }
-       if (intel_dp_need_bigjoiner(intel_dp, mode->hdisplay, target_clock)) {
+       if (intel_dp_need_bigjoiner(intel_dp, intel_connector,
+                                   mode->hdisplay, target_clock)) {
                bigjoiner = true;
                max_dotclk *= 2;