diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2011-10-25 18:54:41 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-07-19 22:50:55 -0400 |
commit | a344a7e7c27776950a70ce4b829a9ac15a212e65 (patch) | |
tree | cec3273f7d64c1aff3505c500a17a2a92fd8199d /drivers/gpu/drm/drm_bufs.c | |
parent | 4c373790a4d4d667d1ab38b1fe2bbf6a8322e93b (diff) |
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: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_bufs.c')
-rw-r--r-- | drivers/gpu/drm/drm_bufs.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index 348b367debeb..b356c719f2f1 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c | |||
@@ -641,8 +641,6 @@ int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request) | |||
641 | 641 | ||
642 | if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) | 642 | if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) |
643 | return -EINVAL; | 643 | return -EINVAL; |
644 | if (dev->queue_count) | ||
645 | return -EBUSY; /* Not while in use */ | ||
646 | 644 | ||
647 | /* Make sure buffers are located in AGP memory that we own */ | 645 | /* Make sure buffers are located in AGP memory that we own */ |
648 | valid = 0; | 646 | valid = 0; |
@@ -704,7 +702,6 @@ int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request) | |||
704 | buf->next = NULL; | 702 | buf->next = NULL; |
705 | buf->waiting = 0; | 703 | buf->waiting = 0; |
706 | buf->pending = 0; | 704 | buf->pending = 0; |
707 | init_waitqueue_head(&buf->dma_wait); | ||
708 | buf->file_priv = NULL; | 705 | buf->file_priv = NULL; |
709 | 706 | ||
710 | buf->dev_priv_size = dev->driver->dev_priv_size; | 707 | 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) | |||
796 | order = drm_order(request->size); | 793 | order = drm_order(request->size); |
797 | size = 1 << order; | 794 | size = 1 << order; |
798 | 795 | ||
799 | DRM_DEBUG("count=%d, size=%d (%d), order=%d, queue_count=%d\n", | 796 | DRM_DEBUG("count=%d, size=%d (%d), order=%d\n", |
800 | request->count, request->size, size, order, dev->queue_count); | 797 | request->count, request->size, size, order); |
801 | 798 | ||
802 | if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) | 799 | if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) |
803 | return -EINVAL; | 800 | return -EINVAL; |
804 | if (dev->queue_count) | ||
805 | return -EBUSY; /* Not while in use */ | ||
806 | 801 | ||
807 | alignment = (request->flags & _DRM_PAGE_ALIGN) | 802 | alignment = (request->flags & _DRM_PAGE_ALIGN) |
808 | ? PAGE_ALIGN(size) : size; | 803 | ? PAGE_ALIGN(size) : size; |
@@ -904,7 +899,6 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) | |||
904 | buf->next = NULL; | 899 | buf->next = NULL; |
905 | buf->waiting = 0; | 900 | buf->waiting = 0; |
906 | buf->pending = 0; | 901 | buf->pending = 0; |
907 | init_waitqueue_head(&buf->dma_wait); | ||
908 | buf->file_priv = NULL; | 902 | buf->file_priv = NULL; |
909 | 903 | ||
910 | buf->dev_priv_size = dev->driver->dev_priv_size; | 904 | 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 | |||
1019 | 1013 | ||
1020 | if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) | 1014 | if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) |
1021 | return -EINVAL; | 1015 | return -EINVAL; |
1022 | if (dev->queue_count) | ||
1023 | return -EBUSY; /* Not while in use */ | ||
1024 | 1016 | ||
1025 | spin_lock(&dev->count_lock); | 1017 | spin_lock(&dev->count_lock); |
1026 | if (dev->buf_use) { | 1018 | if (dev->buf_use) { |
@@ -1071,7 +1063,6 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request | |||
1071 | buf->next = NULL; | 1063 | buf->next = NULL; |
1072 | buf->waiting = 0; | 1064 | buf->waiting = 0; |
1073 | buf->pending = 0; | 1065 | buf->pending = 0; |
1074 | init_waitqueue_head(&buf->dma_wait); | ||
1075 | buf->file_priv = NULL; | 1066 | buf->file_priv = NULL; |
1076 | 1067 | ||
1077 | buf->dev_priv_size = dev->driver->dev_priv_size; | 1068 | 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 | |||
1177 | 1168 | ||
1178 | if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) | 1169 | if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) |
1179 | return -EINVAL; | 1170 | return -EINVAL; |
1180 | if (dev->queue_count) | ||
1181 | return -EBUSY; /* Not while in use */ | ||
1182 | 1171 | ||
1183 | spin_lock(&dev->count_lock); | 1172 | spin_lock(&dev->count_lock); |
1184 | if (dev->buf_use) { | 1173 | if (dev->buf_use) { |
@@ -1228,7 +1217,6 @@ static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request | |||
1228 | buf->next = NULL; | 1217 | buf->next = NULL; |
1229 | buf->waiting = 0; | 1218 | buf->waiting = 0; |
1230 | buf->pending = 0; | 1219 | buf->pending = 0; |
1231 | init_waitqueue_head(&buf->dma_wait); | ||
1232 | buf->file_priv = NULL; | 1220 | buf->file_priv = NULL; |
1233 | 1221 | ||
1234 | buf->dev_priv_size = dev->driver->dev_priv_size; | 1222 | buf->dev_priv_size = dev->driver->dev_priv_size; |