Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/drm/drm_fops.c

+2 −3
Original line number Diff line number Diff line
@@ -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));

	}



	if (drm_core_check_feature(dev, DRIVER_HAVE_DMA)) {

		dev->driver->reclaim_buffers(dev, file_priv);

	}

	if (drm_core_check_feature(dev, DRIVER_HAVE_DMA))

		drm_core_reclaim_buffers(dev, file_priv);

}



static void drm_events_release(struct drm_file *file_priv)

drivers/gpu/drm/gma500/psb_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -632,7 +632,6 @@ static struct drm_driver driver = { 
	.open = psb_driver_open,

	.preclose = psb_driver_preclose,

	.postclose = psb_driver_close,

	.reclaim_buffers = drm_core_reclaim_buffers,



	.gem_init_object = psb_gem_init_object,

	.gem_free_object = psb_gem_free_object,

drivers/gpu/drm/i915/i915_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -940,7 +940,6 @@ static struct drm_driver driver = { 
	.resume = i915_resume,



	.device_is_agp = i915_driver_device_is_agp,

	.reclaim_buffers = drm_core_reclaim_buffers,

	.master_create = i915_master_create,

	.master_destroy = i915_master_destroy,

#if defined(CONFIG_DEBUG_FS)

drivers/gpu/drm/mga/mga_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ static struct drm_driver driver = { 
	.irq_postinstall = mga_driver_irq_postinstall,

	.irq_uninstall = mga_driver_irq_uninstall,

	.irq_handler = mga_driver_irq_handler,

	.reclaim_buffers = drm_core_reclaim_buffers,

	.ioctls = mga_ioctls,

	.dma_ioctl = mga_dma_buffers,

	.fops = &mga_driver_fops,

drivers/gpu/drm/nouveau/nouveau_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -422,7 +422,6 @@ static struct drm_driver driver = { 
	.get_vblank_counter = drm_vblank_count,

	.enable_vblank = nouveau_vblank_enable,

	.disable_vblank = nouveau_vblank_disable,

	.reclaim_buffers = drm_core_reclaim_buffers,

	.ioctls = nouveau_ioctls,

	.fops = &nouveau_driver_fops,