diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-08-23 22:53:24 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-30 09:37:56 +1000 |
| commit | 1da3f87ebb7edb3e0b829ec4bbe5fb3d9d93986f (patch) | |
| tree | af611e50ee6120297e56eed52c041f2ba008ed6d | |
| parent | 59506197c7d0a94088dc15d488d8c964f909a6b1 (diff) | |
| download | linux-3.10-1da3f87ebb7edb3e0b829ec4bbe5fb3d9d93986f.tar.gz linux-3.10-1da3f87ebb7edb3e0b829ec4bbe5fb3d9d93986f.tar.bz2 linux-3.10-1da3f87ebb7edb3e0b829ec4bbe5fb3d9d93986f.zip | |
drm: kill kernel_context_switch callbacks
Not used by any in-kernel driver. So drop it.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/drm_lock.c | 18 | ||||
| -rw-r--r-- | include/drm/drmP.h | 3 |
2 files changed, 0 insertions, 21 deletions
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c index 9bf93bc9a32..609f2d504f7 100644 --- a/drivers/gpu/drm/drm_lock.c +++ b/drivers/gpu/drm/drm_lock.c @@ -136,12 +136,6 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv) } } - if (dev->driver->kernel_context_switch && - dev->last_context != lock->context) { - dev->driver->kernel_context_switch(dev, dev->last_context, - lock->context); - } - return 0; } @@ -159,7 +153,6 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv) int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv) { struct drm_lock *lock = data; - struct drm_master *master = file_priv->master; if (lock->context == DRM_KERNEL_CONTEXT) { DRM_ERROR("Process %d using kernel context %d\n", @@ -169,17 +162,6 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv) atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]); - /* kernel_context_switch isn't used by any of the x86 drm - * modules but is required by the Sparc driver. - */ - if (dev->driver->kernel_context_switch_unlock) - dev->driver->kernel_context_switch_unlock(dev); - else { - if (drm_lock_free(&master->lock, lock->context)) { - /* FIXME: Should really bail out here. */ - } - } - unblock_all_signals(); return 0; } diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 7809d230ade..15ea8c44f28 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -703,9 +703,6 @@ struct drm_driver { int (*dma_quiescent) (struct drm_device *); int (*context_ctor) (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 new); - void (*kernel_context_switch_unlock) (struct drm_device *dev); /** * get_vblank_counter - get raw hardware vblank counter |