diff mbox

[2/8] drm/gem: Don't call drm_mmap from drm_gem_mmap

Message ID 1411480014-10138-3-git-send-email-daniel.vetter@ffwll.ch (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Vetter Sept. 23, 2014, 1:46 p.m. UTC
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>
---
 drivers/gpu/drm/drm_gem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

David Herrmann Sept. 23, 2014, 2:06 p.m. UTC | #1
Hi

On Tue, Sep 23, 2014 at 3:46 PM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> 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.

Agreed! Drivers should just add the hacks themselves if there is
user-space that needs it. Same as for patch #1:

Reviewed-by: David Herrmann <dh.herrmann@gmail.com>

Thanks
David

> So good riddance to another entry point of the legacy buffer mapping
> code.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  drivers/gpu/drm/drm_gem.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
> index eb5dd67153e4..f9af78541505 100644
> --- a/drivers/gpu/drm/drm_gem.c
> +++ b/drivers/gpu/drm/drm_gem.c
> @@ -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;
> --
> 2.1.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff mbox

Patch

diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index eb5dd67153e4..f9af78541505 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -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;