On Tue, Dec 16, 2014 at 04:34:39PM +1000, Dave Airlie wrote:
> From: Dave Airlie <airlied@xxxxxxxxxx>
>
> nouveau userspace back at 1.0.1 used to call the X server
> DRIOpenDRMMaster interface even for DRI2 (doh!), this attempts
> to map the sarea and fails if it can't.
>
> Since 884c6dabb0eafe7227f099c9e78e514191efaf13 from Daniel,
> this fails, but only ancient drivers would see it.
>
> Revert the nouveau bits of that fix, and hope it works.
>
> Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
Argh, sorry for missing that in my git history digging.
Acked-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
Now curious question: Would return 0 also work? As long as userspace only
cares about the errno of the ioctl call and doesn't actually look at the
sarea itself we could keep the cake and eat it, too. I've used a similar
trick in legacy context code, again because old nouveau had copypasta from
dri1, but only cared about the errno and not whether the contexts actually
did anything useful.
I'd really prefer the return 0; patch if possible.
Cheers, Daniel
> ---
> drivers/gpu/drm/nouveau/nouveau_ttm.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
> index 753a6de..3d1cfcb 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
> @@ -28,6 +28,7 @@
> #include "nouveau_ttm.h"
> #include "nouveau_gem.h"
>
> +#include "drm_legacy.h"
> static int
> nouveau_vram_manager_init(struct ttm_mem_type_manager *man, unsigned long psize)
> {
> @@ -281,7 +282,7 @@ nouveau_ttm_mmap(struct file *filp, struct vm_area_struct *vma)
> struct nouveau_drm *drm = nouveau_drm(file_priv->minor->dev);
>
> if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET))
> - return -EINVAL;
> + return drm_legacy_mmap(filp, vma);
>
> return ttm_bo_mmap(filp, vma, &drm->ttm.bdev);
> }
> --
> 1.9.3
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
