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

Commit 8baa1f04 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Update debugfs describe_obj() to show fault-mappable 



The current meaning of whether an object has a GGTT vma is very
ill-defined (and note we don't check for any partials either), it just
means that at some point it was in the GGTT but it may not be now. The
information we really care about here is whether it is taking up
precious mappable aperture space. This is the obj->fault_mappable flag.
We have a redundant long form reprinting of this information, so remove
that in favour of the compact flag.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161012114827.17031-2-chris@chris-wilson.co.uk
parent 4676dc83

drivers/gpu/drm/i915/i915_debugfs.c

+1 −10
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static char get_tiling_flag(struct drm_i915_gem_object *obj) 


static char get_global_flag(struct drm_i915_gem_object *obj)

{

	return i915_gem_object_to_ggtt(obj, NULL) ?  'g' : ' ';

	return obj->fault_mappable ? 'g' : ' ';

}



static char get_pin_mapped_flag(struct drm_i915_gem_object *obj)
@@ -186,15 +186,6 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) 
	}

	if (obj->stolen)

		seq_printf(m, " (stolen: %08llx)", obj->stolen->start);

	if (obj->pin_display || obj->fault_mappable) {

		char s[3], *t = s;

		if (obj->pin_display)

			*t++ = 'p';

		if (obj->fault_mappable)

			*t++ = 'f';

		*t = '\0';

		seq_printf(m, " (%s mappable)", s);

	}



	engine = i915_gem_active_get_engine(&obj->last_write,

					    &dev_priv->drm.struct_mutex);