Commit 7867d709 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/gem: Distinguish each object type 



Separate each object class into a separate lock type to avoid lockdep
cross-contamination between paths (i.e. userptr!).

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191022144501.26486-1-chris@chris-wilson.co.uk
parent a201b00e

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

+2 −1
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ static const struct drm_i915_gem_object_ops i915_gem_object_dmabuf_ops = { 
struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev,

					     struct dma_buf *dma_buf)

{

	static struct lock_class_key lock_class;

	struct dma_buf_attachment *attach;

	struct drm_i915_gem_object *obj;

	int ret;
@@ -287,7 +288,7 @@ struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev, 
	}



	drm_gem_private_object_init(dev, &obj->base, dma_buf->size);

	i915_gem_object_init(obj, &i915_gem_object_dmabuf_ops);

	i915_gem_object_init(obj, &i915_gem_object_dmabuf_ops, &lock_class);

	obj->base.import_attach = attach;

	obj->base.resv = dma_buf->resv;

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

+2 −1
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ struct drm_i915_gem_object * 
i915_gem_object_create_internal(struct drm_i915_private *i915,

				phys_addr_t size)

{

	static struct lock_class_key lock_class;

	struct drm_i915_gem_object *obj;

	unsigned int cache_level;
@@ -178,7 +179,7 @@ i915_gem_object_create_internal(struct drm_i915_private *i915, 
		return ERR_PTR(-ENOMEM);



	drm_gem_private_object_init(&i915->drm, &obj->base, size);

	i915_gem_object_init(obj, &i915_gem_object_internal_ops);

	i915_gem_object_init(obj, &i915_gem_object_internal_ops, &lock_class);



	/*

	 * Mark the object as volatile, such that the pages are marked as

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

+3 −2
Original line number Diff line number Diff line
@@ -47,9 +47,10 @@ void i915_gem_object_free(struct drm_i915_gem_object *obj) 
}



void i915_gem_object_init(struct drm_i915_gem_object *obj,

			  const struct drm_i915_gem_object_ops *ops)

			  const struct drm_i915_gem_object_ops *ops,

			  struct lock_class_key *key)

{

	mutex_init(&obj->mm.lock);

	__mutex_init(&obj->mm.lock, "obj->mm.lock", key);



	spin_lock_init(&obj->vma.lock);

	INIT_LIST_HEAD(&obj->vma.list);

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

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ struct drm_i915_gem_object *i915_gem_object_alloc(void); 
void i915_gem_object_free(struct drm_i915_gem_object *obj);



void i915_gem_object_init(struct drm_i915_gem_object *obj,

			  const struct drm_i915_gem_object_ops *ops);

			  const struct drm_i915_gem_object_ops *ops,

			  struct lock_class_key *key);

struct drm_i915_gem_object *

i915_gem_object_create_shmem(struct drm_i915_private *i915,

			     resource_size_t size);

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

+2 −1
Original line number Diff line number Diff line
@@ -465,6 +465,7 @@ create_shmem(struct intel_memory_region *mem, 
	     resource_size_t size,

	     unsigned int flags)

{

	static struct lock_class_key lock_class;

	struct drm_i915_private *i915 = mem->i915;

	struct drm_i915_gem_object *obj;

	struct address_space *mapping;
@@ -491,7 +492,7 @@ create_shmem(struct intel_memory_region *mem, 
	mapping_set_gfp_mask(mapping, mask);

	GEM_BUG_ON(!(mapping_gfp_mask(mapping) & __GFP_RECLAIM));



	i915_gem_object_init(obj, &i915_gem_shmem_ops);

	i915_gem_object_init(obj, &i915_gem_shmem_ops, &lock_class);



	obj->write_domain = I915_GEM_DOMAIN_CPU;

	obj->read_domains = I915_GEM_DOMAIN_CPU;

CRA Git | Maintained and supported by SUSTech CRA and CCSE