Commit b0071efe authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie

drm: kill reclaim_buffers callback

All leftover users either haven't set DRIVER_HAVE_DMA, in which
case this will never be called, or use the drm_core implementation.

Call that directly in the only callsite.
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent e2b3c5b6
...@@ -381,9 +381,8 @@ static void drm_master_release(struct drm_device *dev, struct file *filp) ...@@ -381,9 +381,8 @@ static void drm_master_release(struct drm_device *dev, struct file *filp)
_DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock)); _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock));
} }
if (drm_core_check_feature(dev, DRIVER_HAVE_DMA)) { if (drm_core_check_feature(dev, DRIVER_HAVE_DMA))
dev->driver->reclaim_buffers(dev, file_priv); drm_core_reclaim_buffers(dev, file_priv);
}
} }
static void drm_events_release(struct drm_file *file_priv) static void drm_events_release(struct drm_file *file_priv)
......
...@@ -632,7 +632,6 @@ static struct drm_driver driver = { ...@@ -632,7 +632,6 @@ static struct drm_driver driver = {
.open = psb_driver_open, .open = psb_driver_open,
.preclose = psb_driver_preclose, .preclose = psb_driver_preclose,
.postclose = psb_driver_close, .postclose = psb_driver_close,
.reclaim_buffers = drm_core_reclaim_buffers,
.gem_init_object = psb_gem_init_object, .gem_init_object = psb_gem_init_object,
.gem_free_object = psb_gem_free_object, .gem_free_object = psb_gem_free_object,
......
...@@ -940,7 +940,6 @@ static struct drm_driver driver = { ...@@ -940,7 +940,6 @@ static struct drm_driver driver = {
.resume = i915_resume, .resume = i915_resume,
.device_is_agp = i915_driver_device_is_agp, .device_is_agp = i915_driver_device_is_agp,
.reclaim_buffers = drm_core_reclaim_buffers,
.master_create = i915_master_create, .master_create = i915_master_create,
.master_destroy = i915_master_destroy, .master_destroy = i915_master_destroy,
#if defined(CONFIG_DEBUG_FS) #if defined(CONFIG_DEBUG_FS)
......
...@@ -75,7 +75,6 @@ static struct drm_driver driver = { ...@@ -75,7 +75,6 @@ static struct drm_driver driver = {
.irq_postinstall = mga_driver_irq_postinstall, .irq_postinstall = mga_driver_irq_postinstall,
.irq_uninstall = mga_driver_irq_uninstall, .irq_uninstall = mga_driver_irq_uninstall,
.irq_handler = mga_driver_irq_handler, .irq_handler = mga_driver_irq_handler,
.reclaim_buffers = drm_core_reclaim_buffers,
.ioctls = mga_ioctls, .ioctls = mga_ioctls,
.dma_ioctl = mga_dma_buffers, .dma_ioctl = mga_dma_buffers,
.fops = &mga_driver_fops, .fops = &mga_driver_fops,
......
...@@ -422,7 +422,6 @@ static struct drm_driver driver = { ...@@ -422,7 +422,6 @@ static struct drm_driver driver = {
.get_vblank_counter = drm_vblank_count, .get_vblank_counter = drm_vblank_count,
.enable_vblank = nouveau_vblank_enable, .enable_vblank = nouveau_vblank_enable,
.disable_vblank = nouveau_vblank_disable, .disable_vblank = nouveau_vblank_disable,
.reclaim_buffers = drm_core_reclaim_buffers,
.ioctls = nouveau_ioctls, .ioctls = nouveau_ioctls,
.fops = &nouveau_driver_fops, .fops = &nouveau_driver_fops,
......
...@@ -71,7 +71,6 @@ static struct drm_driver driver = { ...@@ -71,7 +71,6 @@ static struct drm_driver driver = {
.irq_postinstall = r128_driver_irq_postinstall, .irq_postinstall = r128_driver_irq_postinstall,
.irq_uninstall = r128_driver_irq_uninstall, .irq_uninstall = r128_driver_irq_uninstall,
.irq_handler = r128_driver_irq_handler, .irq_handler = r128_driver_irq_handler,
.reclaim_buffers = drm_core_reclaim_buffers,
.ioctls = r128_ioctls, .ioctls = r128_ioctls,
.dma_ioctl = r128_cce_buffers, .dma_ioctl = r128_cce_buffers,
.fops = &r128_driver_fops, .fops = &r128_driver_fops,
......
...@@ -262,7 +262,6 @@ static struct drm_driver driver_old = { ...@@ -262,7 +262,6 @@ static struct drm_driver driver_old = {
.irq_postinstall = radeon_driver_irq_postinstall, .irq_postinstall = radeon_driver_irq_postinstall,
.irq_uninstall = radeon_driver_irq_uninstall, .irq_uninstall = radeon_driver_irq_uninstall,
.irq_handler = radeon_driver_irq_handler, .irq_handler = radeon_driver_irq_handler,
.reclaim_buffers = drm_core_reclaim_buffers,
.ioctls = radeon_ioctls, .ioctls = radeon_ioctls,
.dma_ioctl = radeon_cp_buffers, .dma_ioctl = radeon_cp_buffers,
.fops = &radeon_driver_old_fops, .fops = &radeon_driver_old_fops,
...@@ -365,7 +364,6 @@ static struct drm_driver kms_driver = { ...@@ -365,7 +364,6 @@ static struct drm_driver kms_driver = {
.irq_postinstall = radeon_driver_irq_postinstall_kms, .irq_postinstall = radeon_driver_irq_postinstall_kms,
.irq_uninstall = radeon_driver_irq_uninstall_kms, .irq_uninstall = radeon_driver_irq_uninstall_kms,
.irq_handler = radeon_driver_irq_handler_kms, .irq_handler = radeon_driver_irq_handler_kms,
.reclaim_buffers = drm_core_reclaim_buffers,
.ioctls = radeon_ioctls_kms, .ioctls = radeon_ioctls_kms,
.gem_init_object = radeon_gem_object_init, .gem_init_object = radeon_gem_object_init,
.gem_free_object = radeon_gem_object_free, .gem_free_object = radeon_gem_object_free,
......
...@@ -54,7 +54,6 @@ static const struct file_operations tdfx_driver_fops = { ...@@ -54,7 +54,6 @@ static const struct file_operations tdfx_driver_fops = {
static struct drm_driver driver = { static struct drm_driver driver = {
.driver_features = DRIVER_USE_MTRR, .driver_features = DRIVER_USE_MTRR,
.reclaim_buffers = drm_core_reclaim_buffers,
.fops = &tdfx_driver_fops, .fops = &tdfx_driver_fops,
.name = DRIVER_NAME, .name = DRIVER_NAME,
.desc = DRIVER_DESC, .desc = DRIVER_DESC,
......
...@@ -876,8 +876,6 @@ struct drm_driver { ...@@ -876,8 +876,6 @@ struct drm_driver {
void (*irq_preinstall) (struct drm_device *dev); void (*irq_preinstall) (struct drm_device *dev);
int (*irq_postinstall) (struct drm_device *dev); int (*irq_postinstall) (struct drm_device *dev);
void (*irq_uninstall) (struct drm_device *dev); void (*irq_uninstall) (struct drm_device *dev);
void (*reclaim_buffers) (struct drm_device *dev,
struct drm_file * file_priv);
void (*set_version) (struct drm_device *dev, void (*set_version) (struct drm_device *dev,
struct drm_set_version *sv); struct drm_set_version *sv);
......
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