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, 5 insertions, 5 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index e3c47a8005ff..2d28dc337cfb 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -319,13 +319,13 @@ static void page_flip_worker(struct work_struct *work)
         struct drm_display_mode *mode = &crtc->mode;
         struct drm_gem_object *bo;
 
-        mutex_lock(&crtc->mutex);
+        drm_modeset_lock(&crtc->mutex, NULL);
         omap_plane_mode_set(omap_crtc->plane, crtc, crtc->primary->fb,
                         0, 0, mode->hdisplay, mode->vdisplay,
                         crtc->x << 16, crtc->y << 16,
                         mode->hdisplay << 16, mode->vdisplay << 16,
                         vblank_cb, crtc);
-        mutex_unlock(&crtc->mutex);
+        drm_modeset_unlock(&crtc->mutex);
 
         bo = omap_framebuffer_bo(crtc->primary->fb, 0);
         drm_gem_object_unreference_unlocked(bo);
@@ -465,7 +465,7 @@ static void apply_worker(struct work_struct *work)
          * the callbacks and list modification all serialized
          * with respect to modesetting ioctls from userspace.
          */
-        mutex_lock(&crtc->mutex);
+        drm_modeset_lock(&crtc->mutex, NULL);
         dispc_runtime_get();
 
         /*
@@ -510,7 +510,7 @@ static void apply_worker(struct work_struct *work)
 
 out:
         dispc_runtime_put();
-        mutex_unlock(&crtc->mutex);
+        drm_modeset_unlock(&crtc->mutex);
 }
 
 int omap_crtc_apply(struct drm_crtc *crtc,
@@ -518,7 +518,7 @@ int omap_crtc_apply(struct drm_crtc *crtc,
 {
         struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
 
-        WARN_ON(!mutex_is_locked(&crtc->mutex));
+        WARN_ON(!drm_modeset_is_locked(&crtc->mutex));
 
         /* no need to queue it again if it is already queued: */
         if (apply->queued)