drm: convert crtc and connection_mutex to ww_mutex (v5)

For atomic, it will be quite necessary to not need to care so much
about locking order.  And 'state' gives us a convenient place to stash a
ww_ctx for any sort of update that needs to grab multiple crtc locks.

Because we will want to eventually make locking even more fine grained
(giving locks to planes, connectors, etc), split out drm_modeset_lock
and drm_modeset_acquire_ctx to track acquired locks.

Atomic will use this to keep track of which locks have been acquired
in a transaction.

v1: original
v2: remove a few things not needed until atomic, for now
v3: update for v3 of connection_mutex patch..
v4: squash in docbook
v5: doc tweaks/fixes

Signed-off-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index d01bb430b5bc..2d5d9b010073 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1154,7 +1154,7 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp)
         u32 pp;
         u32 pp_stat_reg, pp_ctrl_reg;
 
-        WARN_ON(!mutex_is_locked(&dev->mode_config.connection_mutex));
+        WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
 
         if (!intel_dp->want_panel_vdd && edp_have_panel_vdd(intel_dp)) {
                 struct intel_digital_port *intel_dig_port =
@@ -1191,9 +1191,9 @@ static void edp_panel_vdd_work(struct work_struct *__work)
                                                  struct intel_dp, panel_vdd_work);
         struct drm_device *dev = intel_dp_to_dev(intel_dp);
 
-        mutex_lock(&dev->mode_config.connection_mutex);
+        drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);
         edp_panel_vdd_off_sync(intel_dp);
-        mutex_unlock(&dev->mode_config.connection_mutex);
+        drm_modeset_unlock(&dev->mode_config.connection_mutex);
 }
 
 static void edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)
@@ -3666,9 +3666,9 @@ void intel_dp_encoder_destroy(struct drm_encoder *encoder)
         drm_encoder_cleanup(encoder);
         if (is_edp(intel_dp)) {
                 cancel_delayed_work_sync(&intel_dp->panel_vdd_work);
-                mutex_lock(&dev->mode_config.connection_mutex);
+                drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);
                 edp_panel_vdd_off_sync(intel_dp);
-                mutex_unlock(&dev->mode_config.connection_mutex);
+                drm_modeset_unlock(&dev->mode_config.connection_mutex);
         }
         kfree(intel_dig_port);
 }
@@ -4247,9 +4247,9 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
                 drm_dp_aux_unregister(&intel_dp->aux);
                 if (is_edp(intel_dp)) {
                         cancel_delayed_work_sync(&intel_dp->panel_vdd_work);
-                        mutex_lock(&dev->mode_config.connection_mutex);
+                        drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);
                         edp_panel_vdd_off_sync(intel_dp);
-                        mutex_unlock(&dev->mode_config.connection_mutex);
+                        drm_modeset_unlock(&dev->mode_config.connection_mutex);
                 }
                 drm_sysfs_connector_remove(connector);
                 drm_connector_cleanup(connector);