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>
This commit is contained in:
parent
59506197c7
commit
1da3f87ebb
2 changed files with 0 additions and 21 deletions
|
@ -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;
|
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)
|
int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
|
||||||
{
|
{
|
||||||
struct drm_lock *lock = data;
|
struct drm_lock *lock = data;
|
||||||
struct drm_master *master = file_priv->master;
|
|
||||||
|
|
||||||
if (lock->context == DRM_KERNEL_CONTEXT) {
|
if (lock->context == DRM_KERNEL_CONTEXT) {
|
||||||
DRM_ERROR("Process %d using kernel context %d\n",
|
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]);
|
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();
|
unblock_all_signals();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -703,9 +703,6 @@ struct drm_driver {
|
||||||
int (*dma_quiescent) (struct drm_device *);
|
int (*dma_quiescent) (struct drm_device *);
|
||||||
int (*context_ctor) (struct drm_device *dev, int context);
|
int (*context_ctor) (struct drm_device *dev, int context);
|
||||||
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 new);
|
|
||||||
void (*kernel_context_switch_unlock) (struct drm_device *dev);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get_vblank_counter - get raw hardware vblank counter
|
* get_vblank_counter - get raw hardware vblank counter
|
||||||
|
|
Loading…
Reference in a new issue