Commit 0c4dd906 authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie

drm: make kernel context switch same as for drm git tree.

Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 94bb598e
...@@ -561,8 +561,7 @@ struct drm_driver { ...@@ -561,8 +561,7 @@ struct drm_driver {
int (*context_dtor) (struct drm_device * dev, int context); int (*context_dtor) (struct drm_device * dev, int context);
int (*kernel_context_switch) (struct drm_device * dev, int old, int (*kernel_context_switch) (struct drm_device * dev, int old,
int new); int new);
void (*kernel_context_switch_unlock) (struct drm_device * dev, void (*kernel_context_switch_unlock) (struct drm_device * dev);
drm_lock_t *lock);
int (*vblank_wait) (struct drm_device * dev, unsigned int *sequence); int (*vblank_wait) (struct drm_device * dev, unsigned int *sequence);
int (*vblank_wait2) (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); int (*dri_library_name) (struct drm_device *dev, char *buf);
......
...@@ -182,7 +182,7 @@ int drm_unlock(struct inode *inode, struct file *filp, ...@@ -182,7 +182,7 @@ int drm_unlock(struct inode *inode, struct file *filp,
* modules but is required by the Sparc driver. * modules but is required by the Sparc driver.
*/ */
if (dev->driver->kernel_context_switch_unlock) if (dev->driver->kernel_context_switch_unlock)
dev->driver->kernel_context_switch_unlock(dev, &lock); dev->driver->kernel_context_switch_unlock(dev);
else { else {
drm_lock_transfer(dev, &dev->lock.hw_lock->lock, drm_lock_transfer(dev, &dev->lock.hw_lock->lock,
DRM_KERNEL_CONTEXT); DRM_KERNEL_CONTEXT);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment