Commit e61e0f07 authored by Souptick Joarder's avatar Souptick Joarder Committed by Gerd Hoffmann

gpu: drm: virtio: code cleanup

The fault handler code is commented since v4.2.
If there is no plan to enable the fault handler
code in future, we can remove this dead code.
Signed-off-by: default avatarSouptick Joarder <jrdr.linux@gmail.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20180703153353.GA3375@jordon-HP-15-Notebook-PCSigned-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 4354d64e
...@@ -106,29 +106,6 @@ static void virtio_gpu_ttm_global_fini(struct virtio_gpu_device *vgdev) ...@@ -106,29 +106,6 @@ static void virtio_gpu_ttm_global_fini(struct virtio_gpu_device *vgdev)
} }
} }
#if 0
/*
* Hmm, seems to not do anything useful. Leftover debug hack?
* Something like printing pagefaults to kernel log?
*/
static struct vm_operations_struct virtio_gpu_ttm_vm_ops;
static const struct vm_operations_struct *ttm_vm_ops;
static int virtio_gpu_ttm_fault(struct vm_fault *vmf)
{
struct ttm_buffer_object *bo;
struct virtio_gpu_device *vgdev;
int r;
bo = (struct ttm_buffer_object *)vmf->vma->vm_private_data;
if (bo == NULL)
return VM_FAULT_NOPAGE;
vgdev = virtio_gpu_get_vgdev(bo->bdev);
r = ttm_vm_ops->fault(vmf);
return r;
}
#endif
int virtio_gpu_mmap(struct file *filp, struct vm_area_struct *vma) int virtio_gpu_mmap(struct file *filp, struct vm_area_struct *vma)
{ {
struct drm_file *file_priv; struct drm_file *file_priv;
...@@ -143,19 +120,8 @@ int virtio_gpu_mmap(struct file *filp, struct vm_area_struct *vma) ...@@ -143,19 +120,8 @@ int virtio_gpu_mmap(struct file *filp, struct vm_area_struct *vma)
return -EINVAL; return -EINVAL;
} }
r = ttm_bo_mmap(filp, vma, &vgdev->mman.bdev); r = ttm_bo_mmap(filp, vma, &vgdev->mman.bdev);
#if 0
if (unlikely(r != 0))
return r;
if (unlikely(ttm_vm_ops == NULL)) {
ttm_vm_ops = vma->vm_ops;
virtio_gpu_ttm_vm_ops = *ttm_vm_ops;
virtio_gpu_ttm_vm_ops.fault = &virtio_gpu_ttm_fault;
}
vma->vm_ops = &virtio_gpu_ttm_vm_ops;
return 0;
#else
return r; return r;
#endif
} }
static int virtio_gpu_invalidate_caches(struct ttm_bo_device *bdev, static int virtio_gpu_invalidate_caches(struct ttm_bo_device *bdev,
......
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