| Message ID | 20210105153558.134272-15-maarten.lankhorst@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Remove obj->mm.lock! | expand |
Acked-by: Dave Airlie <airlied@redhat.com> burn with the fire. Dave. On Wed, 6 Jan 2021 at 01:46, Maarten Lankhorst <maarten.lankhorst@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@linux.intel.com> > --- > 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 64a946d5f753..241f865077b9 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.rc1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On 1/5/21 4:35 PM, Maarten Lankhorst 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@linux.intel.com> Reviewed-by: Thomas Hellström <thomas.hellstrom@intel.com>
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c index 64a946d5f753..241f865077b9 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
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@linux.intel.com> --- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)