1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 5b59d5ad7d1c..aac212297b49 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -230,10 +230,12 @@ update_connector_routing(struct drm_atomic_state *state, int conn_idx)
         }
 
         connector_state->best_encoder = new_encoder;
-        idx = drm_crtc_index(connector_state->crtc);
+        if (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,