commit fb30ab89f2578a99547361971ea92c7d0db0dc57
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Sat Sep 25 20:35:15 2010 +0200

    Revert "drm: kill kernel_context_switch callbacks"
    
    This reverts commit 1da3f87ebb7edb3e0b829ec4bbe5fb3d9d93986f.

diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
index 4b9007e..2ee2285 100644
--- a/drivers/gpu/drm/drm_lock.c
+++ b/drivers/gpu/drm/drm_lock.c
@@ -159,6 +159,10 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
 
 	atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]);
 
+	if (drm_lock_free(&master->lock, lock->context)) {
+		/* FIXME: Should really bail out here. */
+	}
+
 	unblock_all_signals();
 	return 0;
 }