1 files changed, 11 insertions, 4 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 3da9c0f9e948..52c63135bc65 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -11517,10 +11517,13 @@ encoder_retry:
                         continue;
 
                 encoder = to_intel_encoder(connector_state->best_encoder);
-
-                if (!(encoder->compute_config(encoder, pipe_config, connector_state))) {
-                        DRM_DEBUG_KMS("Encoder config failure\n");
-                        return -EINVAL;
+                ret = encoder->compute_config(encoder, pipe_config,
+                                              connector_state);
+                if (ret < 0) {
+                        if (ret != -EDEADLK)
+                                DRM_DEBUG_KMS("Encoder config failure: %d\n",
+                                              ret);
+                        return ret;
                 }
         }
 
@@ -12695,6 +12698,10 @@ static int intel_atomic_check(struct drm_device *dev,
                                        "[modeset]" : "[fastset]");
         }
 
+        ret = drm_dp_mst_atomic_check(state);
+        if (ret)
+                return ret;
+
         if (any_ms) {
                 ret = intel_modeset_checks(state);