drm/qxl: drop qxl_ttm_fault (80ed59b2) · Commits · 戴 / test

drivers/gpu/drm/qxl/qxl_ttm.c

+1 −26

Original line number	Diff line number	Diff line
		@@ -48,24 +48,8 @@ static struct qxl_device qxl_get_qdev(struct ttm_bo_device bdev)
		return qdev;
		}

		static struct vm_operations_struct qxl_ttm_vm_ops;
		static const struct vm_operations_struct *ttm_vm_ops;

		static vm_fault_t qxl_ttm_fault(struct vm_fault *vmf)
		{
		struct ttm_buffer_object *bo;
		vm_fault_t ret;

		bo = (struct ttm_buffer_object *)vmf->vma->vm_private_data;
		if (bo == NULL)
		return VM_FAULT_NOPAGE;
		ret = ttm_vm_ops->fault(vmf);
		return ret;
		}

		int qxl_mmap(struct file filp, struct vm_area_struct vma)
		{
		int r;
		struct drm_file *file_priv = filp->private_data;
		struct qxl_device *qdev = file_priv->minor->dev->dev_private;

		@@ -77,16 +61,7 @@ int qxl_mmap(struct file filp, struct vm_area_struct vma)
		DRM_DEBUG_DRIVER("filp->private_data = 0x%p, vma->vm_pgoff = %lx\n",
		filp->private_data, vma->vm_pgoff);

		r = ttm_bo_mmap(filp, vma, &qdev->mman.bdev);
		if (unlikely(r != 0))
		return r;
		if (unlikely(ttm_vm_ops == NULL)) {
		ttm_vm_ops = vma->vm_ops;
		qxl_ttm_vm_ops = *ttm_vm_ops;
		qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
		}
		vma->vm_ops = &qxl_ttm_vm_ops;
		return 0;
		return ttm_bo_mmap(filp, vma, &qdev->mman.bdev);
		}

		static int qxl_invalidate_caches(struct ttm_bo_device *bdev, uint32_t flags)