drm/i915: Move the initial fastset commit check to encoder hooks

Move the checks to decide whether a fastset is possible during the
initial commit to an encoder hook. This check is really encoder specific
and the next patch will also require this adding a DP encoder specific
check.

v2: Fix negated condition in gen11_dsi_initial_fastset_check().
v3: Make sure to call the hook for all encoders on the crtc. (Ville)

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/20201005215311.1475666-1-imre.deak@intel.com

diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
index fe946a2e2082fd701f313ddf6ea826e3c0f82a8f..4400e83f783fbf88555ca64ccd1284e757204b72 100644 (file)
--- a/drivers/gpu/drm/i915/display/icl_dsi.c
+++ b/drivers/gpu/drm/i915/display/icl_dsi.c
@@ -1668,6 +1668,19 @@ out:
        return ret;
 }
 
+static bool gen11_dsi_initial_fastset_check(struct intel_encoder *encoder,
+                                           struct intel_crtc_state *crtc_state)
+{
+       if (crtc_state->dsc.compression_enable) {
+               drm_dbg_kms(encoder->base.dev, "Forcing full modeset due to DSC being enabled\n");
+               crtc_state->uapi.mode_changed = true;
+
+               return false;
+       }
+
+       return true;
+}
+
 static void gen11_dsi_encoder_destroy(struct drm_encoder *encoder)
 {
        intel_encoder_destroy(encoder);
@@ -1923,6 +1936,7 @@ void icl_dsi_init(struct drm_i915_private *dev_priv)
        encoder->update_pipe = intel_panel_update_backlight;
        encoder->compute_config = gen11_dsi_compute_config;
        encoder->get_hw_state = gen11_dsi_get_hw_state;
+       encoder->initial_fastset_check = gen11_dsi_initial_fastset_check;
        encoder->type = INTEL_OUTPUT_DSI;
        encoder->cloneable = 0;
        encoder->pipe_mask = ~0;

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index b4c520348b3b256607a51349ffa945c33d2976e9..4e54c55ec99f979a8b228c95be4ffff7160a5505 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -4564,6 +4564,15 @@ void intel_ddi_get_config(struct intel_encoder *encoder,
        intel_read_dp_sdp(encoder, pipe_config, DP_SDP_VSC);
 }
 
+static bool intel_ddi_initial_fastset_check(struct intel_encoder *encoder,
+                                           struct intel_crtc_state *crtc_state)
+{
+       if (intel_crtc_has_dp_encoder(crtc_state))
+               return intel_dp_initial_fastset_check(encoder, crtc_state);
+
+       return true;
+}
+
 static enum intel_output_type
 intel_ddi_compute_output_type(struct intel_encoder *encoder,
                              struct intel_crtc_state *crtc_state,
@@ -5173,6 +5182,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
        encoder->update_pipe = intel_ddi_update_pipe;
        encoder->get_hw_state = intel_ddi_get_hw_state;
        encoder->get_config = intel_ddi_get_config;
+       encoder->initial_fastset_check = intel_ddi_initial_fastset_check;
        encoder->suspend = intel_dp_encoder_suspend;
        encoder->get_power_domains = intel_ddi_get_power_domains;
 

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index aa31a52ebfbe0587ee5da70c283280e528dd3491..918d4cb6c5c20aa70c54dae90070c6ec6fe37341 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -17957,6 +17957,8 @@ retry:
                }
 
                if (crtc_state->hw.active) {
+                       struct intel_encoder *encoder;
+
                        /*
                         * We've not yet detected sink capabilities
                         * (audio,infoframes,etc.) and thus we don't want to
@@ -17978,22 +17980,15 @@ retry:
                         */
                        crtc_state->uapi.color_mgmt_changed = true;
 
-                       /*
-                        * FIXME hack to force full modeset when DSC is being
-                        * used.
-                        *
-                        * As long as we do not have full state readout and
-                        * config comparison of crtc_state->dsc, we have no way
-                        * to ensure reliable fastset. Remove once we have
-                        * readout for DSC.
-                        */
-                       if (crtc_state->dsc.compression_enable) {
-                               ret = drm_atomic_add_affected_connectors(state,
-                                                                        &crtc->base);
-                               if (ret)
-                                       goto out;
-                               crtc_state->uapi.mode_changed = true;
-                               drm_dbg_kms(dev, "Force full modeset for DSC\n");
+                       for_each_intel_encoder_mask(dev, encoder,
+                                                   crtc_state->uapi.encoder_mask) {
+                               if (encoder->initial_fastset_check &&
+                                   !encoder->initial_fastset_check(encoder, crtc_state)) {
+                                       ret = drm_atomic_add_affected_connectors(state,
+                                                                                &crtc->base);
+                                       if (ret)
+                                               goto out;
+                               }
                        }
                }
        }

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index d5dc18cb8c390ab82fdaa14661568012a100124c..5297b2f08ff9b0a178e6662c3e5bb80d8142fa23 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -187,6 +187,14 @@ struct intel_encoder {
         * be set correctly before calling this function. */
        void (*get_config)(struct intel_encoder *,
                           struct intel_crtc_state *pipe_config);
+
+       /*
+        * Optional hook, returning true if this encoder allows a fastset
+        * during the initial commit, false otherwise.
+        */
+       bool (*initial_fastset_check)(struct intel_encoder *encoder,
+                                     struct intel_crtc_state *crtc_state);
+
        /*
         * Acquires the power domains needed for an active encoder during
         * hardware state readout.

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 7429597b57bec58e9d4b810da6aa989ef194dc45..d33a3d9fdc3a63dcd420bec4f02096fb4cc9001e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -3703,6 +3703,27 @@ static void intel_dp_get_config(struct intel_encoder *encoder,
        }
 }
 
+bool intel_dp_initial_fastset_check(struct intel_encoder *encoder,
+                                   struct intel_crtc_state *crtc_state)
+{
+       struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+
+       /*
+        * FIXME hack to force full modeset when DSC is being used.
+        *
+        * As long as we do not have full state readout and config comparison
+        * of crtc_state->dsc, we have no way to ensure reliable fastset.
+        * Remove once we have readout for DSC.
+        */
+       if (crtc_state->dsc.compression_enable) {
+               drm_dbg_kms(&i915->drm, "Forcing full modeset due to DSC being enabled\n");
+               crtc_state->uapi.mode_changed = true;
+               return false;
+       }
+
+       return true;
+}
+
 static void intel_disable_dp(struct intel_atomic_state *state,
                             struct intel_encoder *encoder,
                             const struct intel_crtc_state *old_crtc_state,
@@ -8057,6 +8078,7 @@ bool intel_dp_init(struct drm_i915_private *dev_priv,
        intel_encoder->compute_config = intel_dp_compute_config;
        intel_encoder->get_hw_state = intel_dp_get_hw_state;
        intel_encoder->get_config = intel_dp_get_config;
+       intel_encoder->initial_fastset_check = intel_dp_initial_fastset_check;
        intel_encoder->update_pipe = intel_panel_update_backlight;
        intel_encoder->suspend = intel_dp_encoder_suspend;
        if (IS_CHERRYVIEW(dev_priv)) {

diff --git a/drivers/gpu/drm/i915/display/intel_dp.h b/drivers/gpu/drm/i915/display/intel_dp.h
index 66854aab98875a5631d6b728335f54bd22475ce1..977585aea3c85ff6ed45b0ca06a85712a9d5c7cf 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.h
+++ b/drivers/gpu/drm/i915/display/intel_dp.h
@@ -141,4 +141,7 @@ void intel_ddi_update_pipe(struct intel_atomic_state *state,
 int intel_dp_init_hdcp(struct intel_digital_port *dig_port,
                       struct intel_connector *intel_connector);
 
+bool intel_dp_initial_fastset_check(struct intel_encoder *encoder,
+                                   struct intel_crtc_state *crtc_state);
+
 #endif /* __INTEL_DP_H__ */

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 82f38c386dbdf17bc02c37dceb39736d0aed0305..e948aacbd4ab8c2a868521cfe91c3438978716e7 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -591,6 +591,15 @@ static void intel_dp_mst_enc_get_config(struct intel_encoder *encoder,
        intel_ddi_get_config(&dig_port->base, pipe_config);
 }
 
+static bool intel_dp_mst_initial_fastset_check(struct intel_encoder *encoder,
+                                              struct intel_crtc_state *crtc_state)
+{
+       struct intel_dp_mst_encoder *intel_mst = enc_to_mst(encoder);
+       struct intel_digital_port *dig_port = intel_mst->primary;
+
+       return intel_dp_initial_fastset_check(&dig_port->base, crtc_state);
+}
+
 static int intel_dp_mst_get_ddc_modes(struct drm_connector *connector)
 {
        struct intel_connector *intel_connector = to_intel_connector(connector);
@@ -897,6 +906,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *dig_port, enum pipe
        intel_encoder->enable = intel_mst_enable_dp;
        intel_encoder->get_hw_state = intel_dp_mst_enc_get_hw_state;
        intel_encoder->get_config = intel_dp_mst_enc_get_config;
+       intel_encoder->initial_fastset_check = intel_dp_mst_initial_fastset_check;
 
        return intel_mst;