diff mbox

drm/ttm: kill unused functions

Message ID 1376575397-31789-1-git-send-email-maarten.lankhorst@canonical.com (mailing list archive)
State Accepted
Headers show

Commit Message

Maarten Lankhorst Aug. 15, 2013, 2:03 p.m. UTC 
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
---
 drivers/gpu/drm/ttm/ttm_bo_vm.c | 159 ----------------------------------------
 1 file changed, 159 deletions(-)

Comments

Thomas Hellstrom Aug. 16, 2013, 11:34 a.m. UTC | #1 
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>


On 08/15/2013 04:03 PM, Maarten Lankhorst wrote:
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
> ---
>   drivers/gpu/drm/ttm/ttm_bo_vm.c | 159 ----------------------------------------
>   1 file changed, 159 deletions(-)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
> index 3df9f16..87906c2 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
> @@ -304,162 +304,3 @@ int ttm_fbdev_mmap(struct vm_area_struct *vma, struct ttm_buffer_object *bo)
>   	return 0;
>   }
>   EXPORT_SYMBOL(ttm_fbdev_mmap);
> -
> -
> -ssize_t ttm_bo_io(struct ttm_bo_device *bdev, struct file *filp,
> -		  const char __user *wbuf, char __user *rbuf, size_t count,
> -		  loff_t *f_pos, bool write)
> -{
> -	struct ttm_buffer_object *bo;
> -	struct ttm_bo_driver *driver;
> -	struct ttm_bo_kmap_obj map;
> -	unsigned long dev_offset = (*f_pos >> PAGE_SHIFT);
> -	unsigned long kmap_offset;
> -	unsigned long kmap_end;
> -	unsigned long kmap_num;
> -	size_t io_size;
> -	unsigned int page_offset;
> -	char *virtual;
> -	int ret;
> -	bool no_wait = false;
> -	bool dummy;
> -
> -	read_lock(&bdev->vm_lock);
> -	bo = ttm_bo_vm_lookup_rb(bdev, dev_offset, 1);
> -	if (likely(bo != NULL))
> -		ttm_bo_reference(bo);
> -	read_unlock(&bdev->vm_lock);
> -
> -	if (unlikely(bo == NULL))
> -		return -EFAULT;
> -
> -	driver = bo->bdev->driver;
> -	if (unlikely(!driver->verify_access)) {
> -		ret = -EPERM;
> -		goto out_unref;
> -	}
> -
> -	ret = driver->verify_access(bo, filp);
> -	if (unlikely(ret != 0))
> -		goto out_unref;
> -
> -	kmap_offset = dev_offset - bo->vm_node->start;
> -	if (unlikely(kmap_offset >= bo->num_pages)) {
> -		ret = -EFBIG;
> -		goto out_unref;
> -	}
> -
> -	page_offset = *f_pos & ~PAGE_MASK;
> -	io_size = bo->num_pages - kmap_offset;
> -	io_size = (io_size << PAGE_SHIFT) - page_offset;
> -	if (count < io_size)
> -		io_size = count;
> -
> -	kmap_end = (*f_pos + count - 1) >> PAGE_SHIFT;
> -	kmap_num = kmap_end - kmap_offset + 1;
> -
> -	ret = ttm_bo_reserve(bo, true, no_wait, false, 0);
> -
> -	switch (ret) {
> -	case 0:
> -		break;
> -	case -EBUSY:
> -		ret = -EAGAIN;
> -		goto out_unref;
> -	default:
> -		goto out_unref;
> -	}
> -
> -	ret = ttm_bo_kmap(bo, kmap_offset, kmap_num, &map);
> -	if (unlikely(ret != 0)) {
> -		ttm_bo_unreserve(bo);
> -		goto out_unref;
> -	}
> -
> -	virtual = ttm_kmap_obj_virtual(&map, &dummy);
> -	virtual += page_offset;
> -
> -	if (write)
> -		ret = copy_from_user(virtual, wbuf, io_size);
> -	else
> -		ret = copy_to_user(rbuf, virtual, io_size);
> -
> -	ttm_bo_kunmap(&map);
> -	ttm_bo_unreserve(bo);
> -	ttm_bo_unref(&bo);
> -
> -	if (unlikely(ret != 0))
> -		return -EFBIG;
> -
> -	*f_pos += io_size;
> -
> -	return io_size;
> -out_unref:
> -	ttm_bo_unref(&bo);
> -	return ret;
> -}
> -
> -ssize_t ttm_bo_fbdev_io(struct ttm_buffer_object *bo, const char __user *wbuf,
> -			char __user *rbuf, size_t count, loff_t *f_pos,
> -			bool write)
> -{
> -	struct ttm_bo_kmap_obj map;
> -	unsigned long kmap_offset;
> -	unsigned long kmap_end;
> -	unsigned long kmap_num;
> -	size_t io_size;
> -	unsigned int page_offset;
> -	char *virtual;
> -	int ret;
> -	bool no_wait = false;
> -	bool dummy;
> -
> -	kmap_offset = (*f_pos >> PAGE_SHIFT);
> -	if (unlikely(kmap_offset >= bo->num_pages))
> -		return -EFBIG;
> -
> -	page_offset = *f_pos & ~PAGE_MASK;
> -	io_size = bo->num_pages - kmap_offset;
> -	io_size = (io_size << PAGE_SHIFT) - page_offset;
> -	if (count < io_size)
> -		io_size = count;
> -
> -	kmap_end = (*f_pos + count - 1) >> PAGE_SHIFT;
> -	kmap_num = kmap_end - kmap_offset + 1;
> -
> -	ret = ttm_bo_reserve(bo, true, no_wait, false, 0);
> -
> -	switch (ret) {
> -	case 0:
> -		break;
> -	case -EBUSY:
> -		return -EAGAIN;
> -	default:
> -		return ret;
> -	}
> -
> -	ret = ttm_bo_kmap(bo, kmap_offset, kmap_num, &map);
> -	if (unlikely(ret != 0)) {
> -		ttm_bo_unreserve(bo);
> -		return ret;
> -	}
> -
> -	virtual = ttm_kmap_obj_virtual(&map, &dummy);
> -	virtual += page_offset;
> -
> -	if (write)
> -		ret = copy_from_user(virtual, wbuf, io_size);
> -	else
> -		ret = copy_to_user(rbuf, virtual, io_size);
> -
> -	ttm_bo_kunmap(&map);
> -	ttm_bo_unreserve(bo);
> -	ttm_bo_unref(&bo);
> -
> -	if (unlikely(ret != 0))
> -		return ret;
> -
> -	*f_pos += io_size;
> -
> -	return io_size;
> -}
diff mbox

Patch

diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
index 3df9f16..87906c2 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
@@ -304,162 +304,3 @@  int ttm_fbdev_mmap(struct vm_area_struct *vma, struct ttm_buffer_object *bo)
 	return 0;
 }
 EXPORT_SYMBOL(ttm_fbdev_mmap);
-
-
-ssize_t ttm_bo_io(struct ttm_bo_device *bdev, struct file *filp,
-		  const char __user *wbuf, char __user *rbuf, size_t count,
-		  loff_t *f_pos, bool write)
-{
-	struct ttm_buffer_object *bo;
-	struct ttm_bo_driver *driver;
-	struct ttm_bo_kmap_obj map;
-	unsigned long dev_offset = (*f_pos >> PAGE_SHIFT);
-	unsigned long kmap_offset;
-	unsigned long kmap_end;
-	unsigned long kmap_num;
-	size_t io_size;
-	unsigned int page_offset;
-	char *virtual;
-	int ret;
-	bool no_wait = false;
-	bool dummy;
-
-	read_lock(&bdev->vm_lock);
-	bo = ttm_bo_vm_lookup_rb(bdev, dev_offset, 1);
-	if (likely(bo != NULL))
-		ttm_bo_reference(bo);
-	read_unlock(&bdev->vm_lock);
-
-	if (unlikely(bo == NULL))
-		return -EFAULT;
-
-	driver = bo->bdev->driver;
-	if (unlikely(!driver->verify_access)) {
-		ret = -EPERM;
-		goto out_unref;
-	}
-
-	ret = driver->verify_access(bo, filp);
-	if (unlikely(ret != 0))
-		goto out_unref;
-
-	kmap_offset = dev_offset - bo->vm_node->start;
-	if (unlikely(kmap_offset >= bo->num_pages)) {
-		ret = -EFBIG;
-		goto out_unref;
-	}
-
-	page_offset = *f_pos & ~PAGE_MASK;
-	io_size = bo->num_pages - kmap_offset;
-	io_size = (io_size << PAGE_SHIFT) - page_offset;
-	if (count < io_size)
-		io_size = count;
-
-	kmap_end = (*f_pos + count - 1) >> PAGE_SHIFT;
-	kmap_num = kmap_end - kmap_offset + 1;
-
-	ret = ttm_bo_reserve(bo, true, no_wait, false, 0);
-
-	switch (ret) {
-	case 0:
-		break;
-	case -EBUSY:
-		ret = -EAGAIN;
-		goto out_unref;
-	default:
-		goto out_unref;
-	}
-
-	ret = ttm_bo_kmap(bo, kmap_offset, kmap_num, &map);
-	if (unlikely(ret != 0)) {
-		ttm_bo_unreserve(bo);
-		goto out_unref;
-	}
-
-	virtual = ttm_kmap_obj_virtual(&map, &dummy);
-	virtual += page_offset;
-
-	if (write)
-		ret = copy_from_user(virtual, wbuf, io_size);
-	else
-		ret = copy_to_user(rbuf, virtual, io_size);
-
-	ttm_bo_kunmap(&map);
-	ttm_bo_unreserve(bo);
-	ttm_bo_unref(&bo);
-
-	if (unlikely(ret != 0))
-		return -EFBIG;
-
-	*f_pos += io_size;
-
-	return io_size;
-out_unref:
-	ttm_bo_unref(&bo);
-	return ret;
-}
-
-ssize_t ttm_bo_fbdev_io(struct ttm_buffer_object *bo, const char __user *wbuf,
-			char __user *rbuf, size_t count, loff_t *f_pos,
-			bool write)
-{
-	struct ttm_bo_kmap_obj map;
-	unsigned long kmap_offset;
-	unsigned long kmap_end;
-	unsigned long kmap_num;
-	size_t io_size;
-	unsigned int page_offset;
-	char *virtual;
-	int ret;
-	bool no_wait = false;
-	bool dummy;
-
-	kmap_offset = (*f_pos >> PAGE_SHIFT);
-	if (unlikely(kmap_offset >= bo->num_pages))
-		return -EFBIG;
-
-	page_offset = *f_pos & ~PAGE_MASK;
-	io_size = bo->num_pages - kmap_offset;
-	io_size = (io_size << PAGE_SHIFT) - page_offset;
-	if (count < io_size)
-		io_size = count;
-
-	kmap_end = (*f_pos + count - 1) >> PAGE_SHIFT;
-	kmap_num = kmap_end - kmap_offset + 1;
-
-	ret = ttm_bo_reserve(bo, true, no_wait, false, 0);
-
-	switch (ret) {
-	case 0:
-		break;
-	case -EBUSY:
-		return -EAGAIN;
-	default:
-		return ret;
-	}
-
-	ret = ttm_bo_kmap(bo, kmap_offset, kmap_num, &map);
-	if (unlikely(ret != 0)) {
-		ttm_bo_unreserve(bo);
-		return ret;
-	}
-
-	virtual = ttm_kmap_obj_virtual(&map, &dummy);
-	virtual += page_offset;
-
-	if (write)
-		ret = copy_from_user(virtual, wbuf, io_size);
-	else
-		ret = copy_to_user(rbuf, virtual, io_size);
-
-	ttm_bo_kunmap(&map);
-	ttm_bo_unreserve(bo);
-	ttm_bo_unref(&bo);
-
-	if (unlikely(ret != 0))
-		return ret;
-
-	*f_pos += io_size;
-
-	return io_size;
-}