Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
[linux-3.10.git] / drivers / gpu / drm / omapdrm / omap_crtc.c
similarity index 98%
rename from drivers/staging/omapdrm/omap_crtc.c
rename to drivers/gpu/drm/omapdrm/omap_crtc.c
index 32109c0..bec66a4 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/staging/omapdrm/omap_crtc.c
+ * drivers/gpu/drm/omapdrm/omap_crtc.c
  *
  * Copyright (C) 2011 Texas Instruments
  * Author: Rob Clark <rob@ti.com>
@@ -274,17 +274,16 @@ static void page_flip_worker(struct work_struct *work)
        struct omap_crtc *omap_crtc =
                        container_of(work, struct omap_crtc, page_flip_work);
        struct drm_crtc *crtc = &omap_crtc->base;
-       struct drm_device *dev = crtc->dev;
        struct drm_display_mode *mode = &crtc->mode;
        struct drm_gem_object *bo;
 
-       mutex_lock(&dev->mode_config.mutex);
+       mutex_lock(&crtc->mutex);
        omap_plane_mode_set(omap_crtc->plane, crtc, crtc->fb,
                        0, 0, mode->hdisplay, mode->vdisplay,
                        crtc->x << 16, crtc->y << 16,
                        mode->hdisplay << 16, mode->vdisplay << 16,
                        vblank_cb, crtc);
-       mutex_unlock(&dev->mode_config.mutex);
+       mutex_unlock(&crtc->mutex);
 
        bo = omap_framebuffer_bo(crtc->fb, 0);
        drm_gem_object_unreference_unlocked(bo);
@@ -417,7 +416,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(&dev->mode_config.mutex);
+       mutex_lock(&crtc->mutex);
        dispc_runtime_get();
 
        /*
@@ -462,16 +461,15 @@ static void apply_worker(struct work_struct *work)
 
 out:
        dispc_runtime_put();
-       mutex_unlock(&dev->mode_config.mutex);
+       mutex_unlock(&crtc->mutex);
 }
 
 int omap_crtc_apply(struct drm_crtc *crtc,
                struct omap_drm_apply *apply)
 {
        struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
-       struct drm_device *dev = crtc->dev;
 
-       WARN_ON(!mutex_is_locked(&dev->mode_config.mutex));
+       WARN_ON(!mutex_is_locked(&crtc->mutex));
 
        /* no need to queue it again if it is already queued: */
        if (apply->queued)