Merge remote branch 'korg/drm-radeon-testing' into drm-next-stage

[pandora-kernel.git] / drivers / gpu / drm / radeon / radeon_cursor.c

diff --git a/drivers/gpu/drm/radeon/radeon_cursor.c b/drivers/gpu/drm/radeon/radeon_cursor.c
index 7ecf5e1..b7023ff 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_cursor.c
+++ b/drivers/gpu/drm/radeon/radeon_cursor.c
@@ -186,17 +186,13 @@ int radeon_crtc_cursor_set(struct drm_crtc *crtc,
 unpin:
        if (radeon_crtc->cursor_bo) {
                radeon_gem_object_unpin(radeon_crtc->cursor_bo);
 unpin:
        if (radeon_crtc->cursor_bo) {
                radeon_gem_object_unpin(radeon_crtc->cursor_bo);

-               mutex_lock(&crtc->dev->struct_mutex);
-               drm_gem_object_unreference(radeon_crtc->cursor_bo);
-               mutex_unlock(&crtc->dev->struct_mutex);
+               drm_gem_object_unreference_unlocked(radeon_crtc->cursor_bo);

        }
 
        radeon_crtc->cursor_bo = obj;
        return 0;
 fail:
        }
 
        radeon_crtc->cursor_bo = obj;
        return 0;
 fail:

-       mutex_lock(&crtc->dev->struct_mutex);
-       drm_gem_object_unreference(obj);
-       mutex_unlock(&crtc->dev->struct_mutex);
+       drm_gem_object_unreference_unlocked(obj);

 
        return 0;
 }
 
        return 0;
 }