Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30106f97 authored by Ben Gamari's avatar Ben Gamari Committed by Dave Airlie
Browse files

drm/i915: Consolidate gem object list dumping 



Here we eliminate a few functions in favor of using a single function
to dump from all of the object lists.

Signed-Off-By: default avatarBen Gamari <bgamari@gmail.com>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 955b12de

drivers/gpu/drm/i915/i915_gem_debugfs.c

+28 −58
Original line number Original line Diff line number Diff line
@@ -37,69 +37,38 @@ 




#if defined(CONFIG_DEBUG_FS)

#if defined(CONFIG_DEBUG_FS)





static int i915_gem_active_info(struct seq_file *m, void *data)

#define ACTIVE_LIST	1

{

#define FLUSHING_LIST	2

	struct drm_info_node *node = (struct drm_info_node *) m->private;

#define INACTIVE_LIST	3

	struct drm_device *dev = node->minor->dev;

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_gem_object *obj_priv;



	seq_printf(m, "Active:\n");

	list_for_each_entry(obj_priv, &dev_priv->mm.active_list,

			list)

	{

		struct drm_gem_object *obj = obj_priv->obj;

		if (obj->name) {

			seq_printf(m, "    %p(%d): %08x %08x %d\n",

					obj, obj->name,

					obj->read_domains, obj->write_domain,

					obj_priv->last_rendering_seqno);

		} else {

			seq_printf(m, "       %p: %08x %08x %d\n",

					obj,

					obj->read_domains, obj->write_domain,

					obj_priv->last_rendering_seqno);

		}

	}

	return 0;

}





static int i915_gem_flushing_info(struct seq_file *m, void *data)

static int i915_gem_object_list_info(struct seq_file *m, void *data)

{

{

	struct drm_info_node *node = (struct drm_info_node *) m->private;

	struct drm_info_node *node = (struct drm_info_node *) m->private;

	uintptr_t list = (uintptr_t) node->info_ent->data;

	struct list_head *head;

	struct drm_device *dev = node->minor->dev;

	struct drm_device *dev = node->minor->dev;

	drm_i915_private_t *dev_priv = dev->dev_private;

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_gem_object *obj_priv;

	struct drm_i915_gem_object *obj_priv;





	switch (list) {

	case ACTIVE_LIST:

		seq_printf(m, "Active:\n");

		head = &dev_priv->mm.active_list;

		break;

	case INACTIVE_LIST:

		seq_printf(m, "Inctive:\n");

		head = &dev_priv->mm.inactive_list;

		break;

	case FLUSHING_LIST:

		seq_printf(m, "Flushing:\n");

		seq_printf(m, "Flushing:\n");

	list_for_each_entry(obj_priv, &dev_priv->mm.flushing_list,

		head = &dev_priv->mm.flushing_list;

			list)

		break;

	{

	default:

		struct drm_gem_object *obj = obj_priv->obj;

		DRM_INFO("Ooops, unexpected list\n");

		if (obj->name) {

			seq_printf(m, "    %p(%d): %08x %08x %d\n",

					obj, obj->name,

					obj->read_domains, obj->write_domain,

					obj_priv->last_rendering_seqno);

		} else {

			seq_printf(m, "       %p: %08x %08x %d\n", obj,

					obj->read_domains, obj->write_domain,

					obj_priv->last_rendering_seqno);

		}

	}

		return 0;

		return 0;

	}

	}





static int i915_gem_inactive_info(struct seq_file *m, void *data)

	list_for_each_entry(obj_priv, head, list)

{

	struct drm_info_node *node = (struct drm_info_node *) m->private;

	struct drm_device *dev = node->minor->dev;

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_gem_object *obj_priv;



	seq_printf(m, "Inactive:\n");

	list_for_each_entry(obj_priv, &dev_priv->mm.inactive_list,

			list)

	{

	{

		struct drm_gem_object *obj = obj_priv->obj;

		struct drm_gem_object *obj = obj_priv->obj;

		if (obj->name) {

		if (obj->name) {
@@ -108,7 +77,8 @@ static int i915_gem_inactive_info(struct seq_file *m, void *data) 
					obj->read_domains, obj->write_domain,

					obj->read_domains, obj->write_domain,

					obj_priv->last_rendering_seqno);

					obj_priv->last_rendering_seqno);

		} else {

		} else {

			seq_printf(m, "       %p: %08x %08x %d\n", obj,

			seq_printf(m, "       %p: %08x %08x %d\n",

					obj,

					obj->read_domains, obj->write_domain,

					obj->read_domains, obj->write_domain,

					obj_priv->last_rendering_seqno);

					obj_priv->last_rendering_seqno);

		}

		}
@@ -203,9 +173,9 @@ static int i915_hws_info(struct seq_file *m, void *data) 
}

}





static struct drm_info_list i915_gem_debugfs_list[] = {

static struct drm_info_list i915_gem_debugfs_list[] = {

	{"i915_gem_active", i915_gem_active_info, 0},

	{"i915_gem_active", i915_gem_object_list_info, 0, (void *) ACTIVE_LIST},

	{"i915_gem_flushing", i915_gem_flushing_info, 0},

	{"i915_gem_flushing", i915_gem_object_list_info, 0, (void *) FLUSHING_LIST},

	{"i915_gem_inactive", i915_gem_inactive_info, 0},

	{"i915_gem_inactive", i915_gem_object_list_info, 0, (void *) INACTIVE_LIST},

	{"i915_gem_request", i915_gem_request_info, 0},

	{"i915_gem_request", i915_gem_request_info, 0},

	{"i915_gem_seqno", i915_gem_seqno_info, 0},

	{"i915_gem_seqno", i915_gem_seqno_info, 0},

	{"i915_gem_interrupt", i915_interrupt_info, 0},

	{"i915_gem_interrupt", i915_interrupt_info, 0},