diff options
| author | Dave Airlie <airlied@optimus.localdomain> | 2006-12-19 17:49:44 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-12-19 17:49:44 +1100 |
| commit | 0c4dd906a220fac7997048178ee4f5d8c378b38b (patch) | |
| tree | 3ac85fa61056e3f7430904857a46a36031dcc706 /drivers/char/drm | |
| parent | 94bb598e6b7d68690426f4c7c4385823951861eb (diff) | |
| download | linux-0c4dd906a220fac7997048178ee4f5d8c378b38b.tar.gz linux-0c4dd906a220fac7997048178ee4f5d8c378b38b.tar.bz2 linux-0c4dd906a220fac7997048178ee4f5d8c378b38b.zip | |
drm: make kernel context switch same as for drm git tree.
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm')
| -rw-r--r-- | drivers/char/drm/drmP.h | 3 | ||||
| -rw-r--r-- | drivers/char/drm/drm_lock.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h index 0bbb04f2390f..e31af6748584 100644 --- a/drivers/char/drm/drmP.h +++ b/drivers/char/drm/drmP.h @@ -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); diff --git a/drivers/char/drm/drm_lock.c b/drivers/char/drm/drm_lock.c index 116ed0f2ac09..e9993ba461a2 100644 --- a/drivers/char/drm/drm_lock.c +++ b/drivers/char/drm/drm_lock.c @@ -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); |