Commit 7d192daa authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/gem: Give each object class a friendly name 



Name the object classes and their offspring for easier lockdep
debugging.

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

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

+1 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ static void i915_gem_object_put_pages_dmabuf(struct drm_i915_gem_object *obj, 
}



static const struct drm_i915_gem_object_ops i915_gem_object_dmabuf_ops = {

	.name = "i915_gem_object_dmabuf",

	.get_pages = i915_gem_object_get_pages_dmabuf,

	.put_pages = i915_gem_object_put_pages_dmabuf,

};

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

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ static void i915_gem_object_put_pages_internal(struct drm_i915_gem_object *obj, 
}



static const struct drm_i915_gem_object_ops i915_gem_object_internal_ops = {

	.name = "i915_gem_object_internal",

	.flags = I915_GEM_OBJECT_HAS_STRUCT_PAGE |

		 I915_GEM_OBJECT_IS_SHRINKABLE,

	.get_pages = i915_gem_object_get_pages_internal,

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

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include "i915_drv.h"



const struct drm_i915_gem_object_ops i915_gem_lmem_obj_ops = {

	.name = "i915_gem_object_lmem",

	.flags = I915_GEM_OBJECT_HAS_IOMEM,



	.get_pages = i915_gem_object_get_pages_buddy,

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

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ void i915_gem_object_init(struct drm_i915_gem_object *obj, 
			  const struct drm_i915_gem_object_ops *ops,

			  struct lock_class_key *key)

{

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

	__mutex_init(&obj->mm.lock, ops->name ?: "obj->mm.lock", key);



	spin_lock_init(&obj->vma.lock);

	INIT_LIST_HEAD(&obj->vma.list);

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

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ struct drm_i915_gem_object_ops { 


	int (*dmabuf_export)(struct drm_i915_gem_object *obj);

	void (*release)(struct drm_i915_gem_object *obj);



	const char *name; /* friendly name for debug, e.g. lockdep classes */

};



enum i915_mmap_type {

CRA Git | Maintained and supported by SUSTech CRA and CCSE