diff options
| author | Thomas Zimmermann <[email protected]> | 2021-06-14 04:56:22 +0000 |
|---|---|---|
| committer | Thomas Zimmermann <[email protected]> | 2021-06-14 04:56:22 +0000 |
| commit | bfd616ff9a2602ec66414438c3f9871a49fa1e16 (patch) | |
| tree | 3532c79ea9e2b611b613608cb6082b3bb182ecb5 /drivers/gpu/drm/drm_gem.c | |
| parent | Merge drm/drm-next into drm-misc-next (diff) | |
| parent | drm/i915: Use ttm mmap handling for ttm bo's. (diff) | |
| download | kernel-bfd616ff9a2602ec66414438c3f9871a49fa1e16.tar.gz kernel-bfd616ff9a2602ec66414438c3f9871a49fa1e16.zip | |
Merge tag 'tags/topic/i915-ttm-2021-06-11' into drm-misc-next
drm-misc and drm-intel pull request for topic/i915-ttm:
- Convert i915 lmem handling to ttm.
- Add a patch to temporarily add a driver_private member to vma_node.
- Use this to allow mixed object mmap handling for i915.
Diffstat (limited to 'drivers/gpu/drm/drm_gem.c')
| -rw-r--r-- | drivers/gpu/drm/drm_gem.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index d62fb1a3c916..ba2e64ed8b47 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -1148,15 +1148,6 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) return -EACCES; } - if (node->readonly) { - if (vma->vm_flags & VM_WRITE) { - drm_gem_object_put(obj); - return -EINVAL; - } - - vma->vm_flags &= ~VM_MAYWRITE; - } - ret = drm_gem_mmap_obj(obj, drm_vma_node_size(node) << PAGE_SHIFT, vma); |