drm/i915: Update connector atomic state before crtc sanitize-disabling

During HW state readout/sanitization an up-to-date connector atomic
state will be required by a follow-up patch, which can disable CRTCs
with an encoder (and calling the correct encoder hooks happens via the
connector atomic state encoder pointer). So update the connector state
already before the CRTC sanitize/disable step. For now this doesn't make
a difference, since intel_modeset_update_connector_atomic_state() will
update/enable the atomic state only for connectors that have an enabled
encoder/CRTC. Such CRTCs/encoders will not be affected by
intel_sanitize_crtc().

v2: Add comment about why the connector state needs to be up-to-date.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230510103131.1618266-5-imre.deak@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_modeset_setup.c b/drivers/gpu/drm/i915/display/intel_modeset_setup.c
index 6e55806bbe0660928fa24f3378de3a2c98ec20b5..66796e8eef90a141ad5fae79e217a33afbd572d0 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_modeset_setup.c
+++ b/drivers/gpu/drm/i915/display/intel_modeset_setup.c
@@ -701,6 +701,12 @@ void intel_modeset_setup_hw_state(struct drm_i915_private *i915,
        for_each_intel_encoder(&i915->drm, encoder)
                intel_sanitize_encoder(encoder);
 
+       /*
+        * Sanitizing CRTCs needs their connector atomic state to be
+        * up-to-date, so ensure that already here.
+        */
+       intel_modeset_update_connector_atomic_state(i915);
+
        for_each_intel_crtc(&i915->drm, crtc) {
                struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
@@ -709,8 +715,6 @@ void intel_modeset_setup_hw_state(struct drm_i915_private *i915,
                intel_crtc_state_dump(crtc_state, NULL, "setup_hw_state");
        }
 
-       intel_modeset_update_connector_atomic_state(i915);
-
        intel_dpll_sanitize_state(i915);
 
        intel_wm_get_hw_state(i915);