14 files changed, 54 insertions, 25 deletions

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 5b3e2920c376..f3b98d4b6f46 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -54,6 +54,8 @@ void drm_modeset_lock_all(struct drm_device *dev)
 
         mutex_lock(&dev->mode_config.mutex);
 
+        mutex_lock(&dev->mode_config.connection_mutex);
+
         list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
                 mutex_lock_nest_lock(&crtc->mutex, &dev->mode_config.mutex);
 }
@@ -72,6 +74,8 @@ void drm_modeset_unlock_all(struct drm_device *dev)
         list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
                 mutex_unlock(&crtc->mutex);
 
+        mutex_unlock(&dev->mode_config.connection_mutex);
+
         mutex_unlock(&dev->mode_config.mutex);
 }
 EXPORT_SYMBOL(drm_modeset_unlock_all);
@@ -93,6 +97,7 @@ void drm_warn_on_modeset_not_all_locked(struct drm_device *dev)
         list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
                 WARN_ON(!mutex_is_locked(&crtc->mutex));
 
+        WARN_ON(!mutex_is_locked(&dev->mode_config.connection_mutex));
         WARN_ON(!mutex_is_locked(&dev->mode_config.mutex));
 }
 EXPORT_SYMBOL(drm_warn_on_modeset_not_all_locked);
@@ -1793,6 +1798,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
         DRM_DEBUG_KMS("[CONNECTOR:%d:?]\n", out_resp->connector_id);
 
         mutex_lock(&dev->mode_config.mutex);
+        mutex_lock(&dev->mode_config.connection_mutex);
 
         connector = drm_connector_find(dev, out_resp->connector_id);
         if (!connector) {
@@ -1891,6 +1897,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
         out_resp->count_encoders = encoders_count;
 
 out:
+        mutex_unlock(&dev->mode_config.connection_mutex);
         mutex_unlock(&dev->mode_config.mutex);
 
         return ret;
@@ -4640,6 +4647,7 @@ EXPORT_SYMBOL(drm_format_vert_chroma_subsampling);
 void drm_mode_config_init(struct drm_device *dev)
 {
         mutex_init(&dev->mode_config.mutex);
+        mutex_init(&dev->mode_config.connection_mutex);
         mutex_init(&dev->mode_config.idr_mutex);
         mutex_init(&dev->mode_config.fb_lock);
         INIT_LIST_HEAD(&dev->mode_config.fb_list);
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index 231c9433341f..b55d27c872f6 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -89,6 +89,8 @@ bool drm_helper_encoder_in_use(struct drm_encoder *encoder)
         struct drm_device *dev = encoder->dev;
 
         WARN_ON(!mutex_is_locked(&dev->mode_config.mutex));
+        WARN_ON(!mutex_is_locked(&dev->mode_config.connection_mutex));
+
         list_for_each_entry(connector, &dev->mode_config.connector_list, head)
                 if (connector->encoder == encoder)
                         return true;
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 085e5550aac5..7be21781d3bd 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -3304,6 +3304,8 @@ struct drm_connector *drm_select_eld(struct drm_encoder *encoder,
         struct drm_connector *connector;
         struct drm_device *dev = encoder->dev;
 
+        WARN_ON(!mutex_is_locked(&dev->mode_config.mutex));
+
         list_for_each_entry(connector, &dev->mode_config.connector_list, head)
                 if (connector->encoder == encoder && connector->eld[0])
                         return connector;
diff --git a/drivers/gpu/drm/drm_plane_helper.c b/drivers/gpu/drm/drm_plane_helper.c
index d966afa7ecae..458d9bf09209 100644
--- a/drivers/gpu/drm/drm_plane_helper.c
+++ b/drivers/gpu/drm/drm_plane_helper.c
@@ -54,6 +54,13 @@ static int get_connectors_for_crtc(struct drm_crtc *crtc,
         struct drm_connector *connector;
         int count = 0;
 
+        /*
+         * Note: Once we change the plane hooks to more fine-grained locking we
+         * need to grab the connection_mutex here to be able to make these
+         * checks.
+         */
+        WARN_ON(!mutex_is_locked(&dev->mode_config.connection_mutex));
+
         list_for_each_entry(connector, &dev->mode_config.connector_list, head)
                 if (connector->encoder && connector->encoder->crtc == crtc) {
                         if (connector_list != NULL && count < num_connectors)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 36f4c15f538b..169fc2d8c554 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2609,7 +2609,7 @@ static int i9xx_pipe_crc_auto_source(struct drm_device *dev, enum pipe pipe,
 
         *source = INTEL_PIPE_CRC_SOURCE_PIPE;
 
-        mutex_lock(&dev->mode_config.mutex);
+        drm_modeset_lock_all(dev);
         list_for_each_entry(encoder, &dev->mode_config.encoder_list,
                             base.head) {
                 if (!encoder->base.crtc)
@@ -2645,7 +2645,7 @@ static int i9xx_pipe_crc_auto_source(struct drm_device *dev, enum pipe pipe,
                         break;
                 }
         }
-        mutex_unlock(&dev->mode_config.mutex);
+        drm_modeset_unlock_all(dev);
 
         return ret;
 }
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 4619c9e51907..5b5b82c3f570 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -533,13 +533,11 @@ static int i915_drm_freeze(struct drm_device *dev)
                  * Disable CRTCs directly since we want to preserve sw state
                  * for _thaw.
                  */
-                mutex_lock(&dev->mode_config.mutex);
+                drm_modeset_lock_all(dev);
                 for_each_crtc(dev, crtc) {
-                        mutex_lock(&crtc->mutex);
                         dev_priv->display.crtc_disable(crtc);
-                        mutex_unlock(&crtc->mutex);
                 }
-                mutex_unlock(&dev->mode_config.mutex);
+                drm_modeset_unlock_all(dev);
 
                 intel_modeset_suspend_hw(dev);
         }
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index e80b2917e3cb..c2976ade823f 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8323,6 +8323,8 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,
                       connector->base.id, connector->name,
                       encoder->base.id, encoder->name);