Commit c6bcc0c2 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/i915: Reject UNSYNCHRONIZED for userptr, v2. 



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: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: default avatarDave Airlie <airlied@redhat.com>
Reviewed-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Acked-by: default avatarJason Ekstrand <jason@jlekstrand.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210323155059.628690-15-maarten.lankhorst@linux.intel.com
parent 02b64a4a

drivers/gpu/drm/i915/gem/i915_gem_userptr.c

+2 −8
Original line number Diff line number Diff line
@@ -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;

}



static void