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

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

drm: kill dma queue support 



Absolutely unused. All the values are only ever initialized and
then used at most in some debug printout functions.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 4c373790

drivers/gpu/drm/drm_bufs.c

+2 −14
Original line number Diff line number Diff line
@@ -641,8 +641,6 @@ int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request) 


	if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER)

		return -EINVAL;

	if (dev->queue_count)

		return -EBUSY;	/* Not while in use */



	/* Make sure buffers are located in AGP memory that we own */

	valid = 0;
@@ -704,7 +702,6 @@ int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request) 
		buf->next = NULL;

		buf->waiting = 0;

		buf->pending = 0;

		init_waitqueue_head(&buf->dma_wait);

		buf->file_priv = NULL;



		buf->dev_priv_size = dev->driver->dev_priv_size;
@@ -796,13 +793,11 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) 
	order = drm_order(request->size);

	size = 1 << order;



	DRM_DEBUG("count=%d, size=%d (%d), order=%d, queue_count=%d\n",

		  request->count, request->size, size, order, dev->queue_count);

	DRM_DEBUG("count=%d, size=%d (%d), order=%d\n",

		  request->count, request->size, size, order);



	if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER)

		return -EINVAL;

	if (dev->queue_count)

		return -EBUSY;	/* Not while in use */



	alignment = (request->flags & _DRM_PAGE_ALIGN)

	    ? PAGE_ALIGN(size) : size;
@@ -904,7 +899,6 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) 
			buf->next = NULL;

			buf->waiting = 0;

			buf->pending = 0;

			init_waitqueue_head(&buf->dma_wait);

			buf->file_priv = NULL;



			buf->dev_priv_size = dev->driver->dev_priv_size;
@@ -1019,8 +1013,6 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request 


	if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER)

		return -EINVAL;

	if (dev->queue_count)

		return -EBUSY;	/* Not while in use */



	spin_lock(&dev->count_lock);

	if (dev->buf_use) {
@@ -1071,7 +1063,6 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request 
		buf->next = NULL;

		buf->waiting = 0;

		buf->pending = 0;

		init_waitqueue_head(&buf->dma_wait);

		buf->file_priv = NULL;



		buf->dev_priv_size = dev->driver->dev_priv_size;
@@ -1177,8 +1168,6 @@ static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request 


	if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER)

		return -EINVAL;

	if (dev->queue_count)

		return -EBUSY;	/* Not while in use */



	spin_lock(&dev->count_lock);

	if (dev->buf_use) {
@@ -1228,7 +1217,6 @@ static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request 
		buf->next = NULL;

		buf->waiting = 0;

		buf->pending = 0;

		init_waitqueue_head(&buf->dma_wait);

		buf->file_priv = NULL;



		buf->dev_priv_size = dev->driver->dev_priv_size;

drivers/gpu/drm/drm_debugfs.c

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ static struct drm_info_list drm_debugfs_list[] = { 
	{"name", drm_name_info, 0},

	{"vm", drm_vm_info, 0},

	{"clients", drm_clients_info, 0},

	{"queues", drm_queues_info, 0},

	{"bufs", drm_bufs_info, 0},

	{"gem_names", drm_gem_name_info, DRIVER_GEM},

#if DRM_DEBUG_CODE

drivers/gpu/drm/drm_dma.c

+0 −5
Original line number Diff line number Diff line
@@ -120,11 +120,6 @@ void drm_free_buffer(struct drm_device *dev, struct drm_buf * buf) 
	buf->pending = 0;

	buf->file_priv = NULL;

	buf->used = 0;



	if (drm_core_check_feature(dev, DRIVER_DMA_QUEUE)

	    && waitqueue_active(&buf->dma_wait)) {

		wake_up_interruptible(&buf->dma_wait);

	}

}



/**

drivers/gpu/drm/drm_drv.c

+0 −11
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ static struct drm_ioctl_desc drm_ioctls[] = { 
int drm_lastclose(struct drm_device * dev)

{

	struct drm_vma_entry *vma, *vma_temp;

	int i;



	DRM_DEBUG("\n");
@@ -228,16 +227,6 @@ int drm_lastclose(struct drm_device * dev) 
		kfree(vma);

	}



	if (drm_core_check_feature(dev, DRIVER_DMA_QUEUE) && dev->queuelist) {

		for (i = 0; i < dev->queue_count; i++) {

			kfree(dev->queuelist[i]);

			dev->queuelist[i] = NULL;

		}

		kfree(dev->queuelist);

		dev->queuelist = NULL;

	}

	dev->queue_count = 0;



	if (drm_core_check_feature(dev, DRIVER_HAVE_DMA) &&

	    !drm_core_check_feature(dev, DRIVER_MODESET))

		drm_dma_takedown(dev);

drivers/gpu/drm/drm_fops.c

+0 −4
Original line number Diff line number Diff line
@@ -75,10 +75,6 @@ static int drm_setup(struct drm_device * dev) 


	dev->sigdata.lock = NULL;



	dev->queue_count = 0;

	dev->queue_reserved = 0;

	dev->queue_slots = 0;

	dev->queuelist = NULL;

	dev->context_flag = 0;

	dev->interrupt_flag = 0;

	dev->dma_flag = 0;