drm: make kernel context switch same as for drm git tree.
authorDave Airlie <airlied@optimus.localdomain>
Tue, 19 Dec 2006 06:49:44 +0000 (17:49 +1100)
committerDave Airlie <airlied@linux.ie>
Tue, 19 Dec 2006 06:49:44 +0000 (17:49 +1100)
Signed-off-by: Dave Airlie <airlied@linux.ie>
drivers/char/drm/drmP.h
drivers/char/drm/drm_lock.c

index 0bbb04f2390f26d8383bff7f6cebb6f40879f827..e31af674858406ce649e377927a5e4ee1a800a4f 100644 (file)
@@ -561,8 +561,7 @@ struct drm_driver {
        int (*context_dtor) (struct drm_device * dev, int context);
        int (*kernel_context_switch) (struct drm_device * dev, int old,
                                      int new);
-       void (*kernel_context_switch_unlock) (struct drm_device * dev,
-                                             drm_lock_t *lock);
+       void (*kernel_context_switch_unlock) (struct drm_device * dev);
        int (*vblank_wait) (struct drm_device * dev, unsigned int *sequence);
        int (*vblank_wait2) (struct drm_device * dev, unsigned int *sequence);
        int (*dri_library_name) (struct drm_device *dev, char *buf);
index 116ed0f2ac09738e500ce038470d63845c019762..e9993ba461a2ba85e39229ebfc9d46dbe240d13a 100644 (file)
@@ -182,7 +182,7 @@ int drm_unlock(struct inode *inode, struct file *filp,
         * modules but is required by the Sparc driver.
         */
        if (dev->driver->kernel_context_switch_unlock)
-               dev->driver->kernel_context_switch_unlock(dev, &lock);
+               dev->driver->kernel_context_switch_unlock(dev);
        else {
                drm_lock_transfer(dev, &dev->lock.hw_lock->lock,
                                  DRM_KERNEL_CONTEXT);