1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 8694ca9beee3..9dcc7280e572 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -234,13 +234,14 @@ update_connector_routing(struct drm_atomic_state *state, int conn_idx)
                 }
         }
 
+        if (WARN_ON(!connector_state->crtc))
+                return -EINVAL;
+
         connector_state->best_encoder = new_encoder;
-        if (connector_state->crtc) {
-                idx = drm_crtc_index(connector_state->crtc);
+        idx = drm_crtc_index(connector_state->crtc);
 
-                crtc_state = state->crtc_states[idx];
-                crtc_state->mode_changed = true;
-        }
+        crtc_state = state->crtc_states[idx];
+        crtc_state->mode_changed = true;
 
         DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] using [ENCODER:%d:%s] on [CRTC:%d]\n",
                          connector->base.id,