drm/i915: Properly flag modesets for all bigjoiner pipes

If either of the bigjoiner pipes needs a modeset then we need
a modeset on both pipes. Make it so.

v2: Split out the kill_bigjoiner_slave() change (Manasi)
    Add affected connectors/planes

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201124201156.17095-3-ville.syrjala@linux.intel.com
Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index bcc7d5f8e0a84ef89400c837f32890e9fdea1a82..be741c5378923cf2369ac56b4a50b2e268dda695 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -15487,20 +15487,36 @@ static int intel_atomic_check_async(struct intel_atomic_state *state)
 
 static int intel_bigjoiner_add_affected_crtcs(struct intel_atomic_state *state)
 {
-       const struct intel_crtc_state *crtc_state;
+       struct intel_crtc_state *crtc_state;
        struct intel_crtc *crtc;
        int i;
 
        for_each_new_intel_crtc_in_state(state, crtc, crtc_state, i) {
                struct intel_crtc_state *linked_crtc_state;
+               struct intel_crtc *linked_crtc;
+               int ret;
 
                if (!crtc_state->bigjoiner)
                        continue;
 
-               linked_crtc_state = intel_atomic_get_crtc_state(&state->base,
-                                                               crtc_state->bigjoiner_linked_crtc);
+               linked_crtc = crtc_state->bigjoiner_linked_crtc;
+               linked_crtc_state = intel_atomic_get_crtc_state(&state->base, linked_crtc);
                if (IS_ERR(linked_crtc_state))
                        return PTR_ERR(linked_crtc_state);
+
+               if (!needs_modeset(crtc_state))
+                       continue;
+
+               linked_crtc_state->uapi.mode_changed = true;
+
+               ret = drm_atomic_add_affected_connectors(&state->base,
+                                                        &linked_crtc->base);
+               if (ret)
+                       return ret;
+
+               ret = intel_atomic_add_affected_planes(state, linked_crtc);
+               if (ret)
+                       return ret;
        }
 
        return 0;
@@ -15620,6 +15636,16 @@ static int intel_atomic_check(struct drm_device *dev,
                                new_crtc_state->update_pipe = false;
                        }
                }
+
+               if (new_crtc_state->bigjoiner) {
+                       struct intel_crtc_state *linked_crtc_state =
+                               intel_atomic_get_new_crtc_state(state, new_crtc_state->bigjoiner_linked_crtc);
+
+                       if (needs_modeset(linked_crtc_state)) {
+                               new_crtc_state->uapi.mode_changed = true;
+                               new_crtc_state->update_pipe = false;
+                       }
+               }
        }
 
        for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,