drm/i915/dp: Fix connector DSC HW state readout

The DSC HW state of DP connectors is read out during driver loading and
system resume in intel_modeset_update_connector_atomic_state(). This
function is called for all connectors though and so the state of DSI
connectors will also get updated incorrectly, triggering a WARN there
wrt. the DSC decompression AUX device.

Fix the above by moving the DSC state readout to a new DP connector
specific sync_state() hook. This is anyway the logical place to update
the connector object's state vs. the connector's atomic state.

Fixes: b2608c6b3212 ("drm/i915/dp_mst: Enable MST DSC decompression for all streams")
Reported-and-tested-by: Drew Davenport <[email protected]>
Closes: https://lore.kernel.org/all/[email protected]
Reviewed-by: Ankit Nautiyal <[email protected]>
Signed-off-by: Imre Deak <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
(cherry picked from commit a62e145981500996ea76af3d740ce0c0d74c5be0)
Signed-off-by: Joonas Lahtinen <[email protected]>

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 3fdd8a5179831288f1e10bc8d9161d8d23a7ba6a..ac7fe6281afe3f52b37c0e75f422045982bb076a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -609,6 +609,13 @@ struct intel_connector {
         * and active (i.e. dpms ON state). */
        bool (*get_hw_state)(struct intel_connector *);
 
+       /*
+        * Optional hook called during init/resume to sync any state
+        * stored in the connector (eg. DSC state) wrt. the HW state.
+        */
+       void (*sync_state)(struct intel_connector *connector,
+                          const struct intel_crtc_state *crtc_state);
+
        /* Panel info for eDP and LVDS */
        struct intel_panel panel;
 

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index ae647d03af25cd48a3151b362c5ed1e752bdba60..38efc8d177d03ce14b8c43f9ed81c60e554bb634 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -5859,6 +5859,19 @@ intel_dp_connector_unregister(struct drm_connector *connector)
        intel_connector_unregister(connector);
 }
 
+void intel_dp_connector_sync_state(struct intel_connector *connector,
+                                  const struct intel_crtc_state *crtc_state)
+{
+       struct drm_i915_private *i915 = to_i915(connector->base.dev);
+
+       if (crtc_state && crtc_state->dsc.compression_enable) {
+               drm_WARN_ON(&i915->drm, !connector->dp.dsc_decompression_aux);
+               connector->dp.dsc_decompression_enabled = true;
+       } else {
+               connector->dp.dsc_decompression_enabled = false;
+       }
+}
+
 void intel_dp_encoder_flush_work(struct drm_encoder *encoder)
 {
        struct intel_digital_port *dig_port = enc_to_dig_port(to_intel_encoder(encoder));

diff --git a/drivers/gpu/drm/i915/display/intel_dp.h b/drivers/gpu/drm/i915/display/intel_dp.h
index 05db46b111f216e150760e0dff76581cc18bbcca..375d0677cd8c516c56ca2cf9ba592b4746677304 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.h
+++ b/drivers/gpu/drm/i915/display/intel_dp.h
@@ -45,6 +45,8 @@ bool intel_dp_limited_color_range(const struct intel_crtc_state *crtc_state,
 int intel_dp_min_bpp(enum intel_output_format output_format);
 bool intel_dp_init_connector(struct intel_digital_port *dig_port,
                             struct intel_connector *intel_connector);
+void intel_dp_connector_sync_state(struct intel_connector *connector,
+                                  const struct intel_crtc_state *crtc_state);
 void intel_dp_set_link_params(struct intel_dp *intel_dp,
                              int link_rate, int lane_count);
 int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp,

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 8a9432335030346ecf3b7501a4cfb19cd59d5259..a01a59f57ae5525acb65e2725b3b37a9e31a065c 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -1534,6 +1534,7 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
                return NULL;
 
        intel_connector->get_hw_state = intel_dp_mst_get_hw_state;
+       intel_connector->sync_state = intel_dp_connector_sync_state;
        intel_connector->mst_port = intel_dp;
        intel_connector->port = port;
        drm_dp_mst_get_port_malloc(port);

diff --git a/drivers/gpu/drm/i915/display/intel_modeset_setup.c b/drivers/gpu/drm/i915/display/intel_modeset_setup.c
index 94eece7f63be3341fc92807345c0f7b01f862275..caeca3a8442c5d76008525ff56c65356eb6171be 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_modeset_setup.c
+++ b/drivers/gpu/drm/i915/display/intel_modeset_setup.c
@@ -318,12 +318,6 @@ static void intel_modeset_update_connector_atomic_state(struct drm_i915_private
                        const struct intel_crtc_state *crtc_state =
                                to_intel_crtc_state(crtc->base.state);
 
-                       if (crtc_state->dsc.compression_enable) {
-                               drm_WARN_ON(&i915->drm, !connector->dp.dsc_decompression_aux);
-                               connector->dp.dsc_decompression_enabled = true;
-                       } else {
-                               connector->dp.dsc_decompression_enabled = false;
-                       }
                        conn_state->max_bpc = (crtc_state->pipe_bpp ?: 24) / 3;
                }
        }
@@ -775,8 +769,9 @@ static void intel_modeset_readout_hw_state(struct drm_i915_private *i915)
 
        drm_connector_list_iter_begin(&i915->drm, &conn_iter);
        for_each_intel_connector_iter(connector, &conn_iter) {
+               struct intel_crtc_state *crtc_state = NULL;
+
                if (connector->get_hw_state(connector)) {
-                       struct intel_crtc_state *crtc_state;
                        struct intel_crtc *crtc;
 
                        connector->base.dpms = DRM_MODE_DPMS_ON;
@@ -802,6 +797,10 @@ static void intel_modeset_readout_hw_state(struct drm_i915_private *i915)
                        connector->base.dpms = DRM_MODE_DPMS_OFF;
                        connector->base.encoder = NULL;
                }
+
+               if (connector->sync_state)
+                       connector->sync_state(connector, crtc_state);
+
                drm_dbg_kms(&i915->drm,
                            "[CONNECTOR:%d:%s] hw state readout: %s\n",
                            connector->base.base.id, connector->base.name,