Commit f6c26b55 authored by Janusz Krzysztofik's avatar Janusz Krzysztofik Committed by Chris Wilson
Browse files

drm/i915: Never allow userptr into the new mapping types 



Commit 4f2a572e ("drm/i915/userptr: Never allow userptr into the
mappable GGTT") made I915_GEM_MMAP_GTT IOCTLs to fail when attempted
on a userptr object in order to protect from a lockdep splat.  Later
on, new mapping types were introduced by commit cc662126
("drm/i915: Introduce DRM_I915_GEM_MMAP_OFFSET").  Those new mapping
types suffer from the same lockdep splat issue but they now succeed
when tried on top of a userptr object.  Fix it.

v2: Don't play with the -ENODEV driver response (Chris)

Signed-off-by: default avatarJanusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
Cc: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20200204162302.1299516-1-chris@chris-wilson.co.uk
parent 6311d260

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

+1 −2
Original line number Diff line number Diff line
@@ -613,8 +613,7 @@ __assign_mmap_offset(struct drm_file *file, 
	if (!obj)

		return -ENOENT;



	if (mmap_type == I915_MMAP_TYPE_GTT &&

	    i915_gem_object_never_bind_ggtt(obj)) {

	if (i915_gem_object_never_mmap(obj)) {

		err = -ENODEV;

		goto out;

	}

drivers/gpu/drm/i915/gem/i915_gem_object.h

+2 −2
Original line number Diff line number Diff line
@@ -194,9 +194,9 @@ i915_gem_object_is_proxy(const struct drm_i915_gem_object *obj) 
}



static inline bool

i915_gem_object_never_bind_ggtt(const struct drm_i915_gem_object *obj)

i915_gem_object_never_mmap(const struct drm_i915_gem_object *obj)

{

	return i915_gem_object_type_has(obj, I915_GEM_OBJECT_NO_GGTT);

	return i915_gem_object_type_has(obj, I915_GEM_OBJECT_NO_MMAP);

}



static inline bool

drivers/gpu/drm/i915/gem/i915_gem_object_types.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ struct drm_i915_gem_object_ops { 
#define I915_GEM_OBJECT_HAS_IOMEM	BIT(1)

#define I915_GEM_OBJECT_IS_SHRINKABLE	BIT(2)

#define I915_GEM_OBJECT_IS_PROXY	BIT(3)

#define I915_GEM_OBJECT_NO_GGTT		BIT(4)

#define I915_GEM_OBJECT_NO_MMAP		BIT(4)

#define I915_GEM_OBJECT_ASYNC_CANCEL	BIT(5)



	/* Interface between the GEM object and its backing storage.

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

+1 −1
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ i915_gem_userptr_dmabuf_export(struct drm_i915_gem_object *obj) 
static const struct drm_i915_gem_object_ops i915_gem_userptr_ops = {

	.flags = I915_GEM_OBJECT_HAS_STRUCT_PAGE |

		 I915_GEM_OBJECT_IS_SHRINKABLE |

		 I915_GEM_OBJECT_NO_GGTT |

		 I915_GEM_OBJECT_NO_MMAP |

		 I915_GEM_OBJECT_ASYNC_CANCEL,

	.get_pages = i915_gem_userptr_get_pages,

	.put_pages = i915_gem_userptr_put_pages,

drivers/gpu/drm/i915/i915_gem.c

+0 −3
Original line number Diff line number Diff line
@@ -941,9 +941,6 @@ i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj, 
	struct i915_vma *vma;

	int ret;



	if (i915_gem_object_never_bind_ggtt(obj))

		return ERR_PTR(-ENODEV);



	if (flags & PIN_MAPPABLE &&

	    (!view || view->type == I915_GGTT_VIEW_NORMAL)) {

		/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE