]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
drm/gem: Don't call drm_mmap from drm_gem_mmap
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 23 Sep 2014 13:46:48 +0000 (15:46 +0200)
committerDave Airlie <airlied@redhat.com>
Wed, 24 Sep 2014 01:42:58 +0000 (11:42 +1000)
The only user I could dig out was i915 back when ums+gem was still a
thing. But we've just very much killed that, and even when someone
screams about that we should resurrect that with a special hack
(wrapping drm_gem_mmap) in i915, not in the core code.

So good riddance to another entry point of the legacy buffer mapping
code.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/drm_gem.c

index eb5dd67153e466f4eae0a659947ff4676cc572d9..f9af785415057c20e9a8ec32d2ea57c210a92e0c 100644 (file)
@@ -888,7 +888,7 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
                                           vma_pages(vma));
        if (!node) {
                mutex_unlock(&dev->struct_mutex);
-               return drm_mmap(filp, vma);
+               return -EINVAL;
        } else if (!drm_vma_node_is_allowed(node, filp)) {
                mutex_unlock(&dev->struct_mutex);
                return -EACCES;