[Intel-gfx] [PATCH v7 14/63] drm/i915: Reject UNSYNCHRONIZED for userptr, v2.

[Jason Ekstrand]

We've never used this bit in mesa.

Acked-by: Jason Ekstrand <jason at jlekstrand.net>

On Thu, Jan 28, 2021 at 10:26 AM Maarten Lankhorst
<maarten.lankhorst at linux.intel.com> wrote:
>
> We should not allow this any more, as it will break with the new userptr
> implementation, it could still be made to work, but there's no point in
> doing so.
>
> Inspection of the beignet opencl driver shows that it's only used
> when normal userptr is not available, which means for new kernels
> you will need CONFIG_I915_USERPTR.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Acked-by: Dave Airlie <airlied at redhat.com>
> Reviewed-by: Thomas Hellström <thomas.hellstrom at linux.intel.com>
> Cc: Jason Ekstrand <jason at jlekstrand.net>
> ---
>  drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 10 ++--------
>  1 file changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
> index c89cf911fb29..80bc10b4ac74 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
> @@ -224,7 +224,7 @@ i915_gem_userptr_init__mmu_notifier(struct drm_i915_gem_object *obj,
>         struct i915_mmu_object *mo;
>
>         if (flags & I915_USERPTR_UNSYNCHRONIZED)
> -               return capable(CAP_SYS_ADMIN) ? 0 : -EPERM;
> +               return -ENODEV;
>
>         if (GEM_WARN_ON(!obj->userptr.mm))
>                 return -EINVAL;
> @@ -274,13 +274,7 @@ static int
>  i915_gem_userptr_init__mmu_notifier(struct drm_i915_gem_object *obj,
>                                     unsigned flags)
>  {
> -       if ((flags & I915_USERPTR_UNSYNCHRONIZED) == 0)
> -               return -ENODEV;
> -
> -       if (!capable(CAP_SYS_ADMIN))
> -               return -EPERM;
> -
> -       return 0;
> +       return -ENODEV;
>  }
>
>  static void
> --
> 2.30.0
>