drm/i915: add mappable to gem_object_bind tracepoint

This way we can make some more educated guesses as to why exactly
we can't use 2G apertures to their full potential ;)

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 6d9971f0ed928f6742b68909975543b8ec0c0c4b..bb5435ba01aace88efc3a9f4f95a9a6e046aa570 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2775,7 +2775,7 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj,
        BUG_ON(obj->write_domain & I915_GEM_GPU_DOMAINS);
 
        obj_priv->gtt_offset = obj_priv->gtt_space->start;
-       trace_i915_gem_object_bind(obj, obj_priv->gtt_offset);
+       trace_i915_gem_object_bind(obj, obj_priv->gtt_offset, mappable);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
index fea97a21cc1435a67a95563e786cf41a4acc7858..0b1049ff72a3caf60eddcc37a9ae00da2718f9fc 100644 (file)
--- a/drivers/gpu/drm/i915/i915_trace.h
+++ b/drivers/gpu/drm/i915/i915_trace.h
@@ -35,22 +35,25 @@ TRACE_EVENT(i915_gem_object_create,
 
 TRACE_EVENT(i915_gem_object_bind,
 
-           TP_PROTO(struct drm_gem_object *obj, u32 gtt_offset),
+           TP_PROTO(struct drm_gem_object *obj, u32 gtt_offset, bool mappable),
 
-           TP_ARGS(obj, gtt_offset),
+           TP_ARGS(obj, gtt_offset, mappable),
 
            TP_STRUCT__entry(
                             __field(struct drm_gem_object *, obj)
                             __field(u32, gtt_offset)
+                            __field(bool, mappable)
                             ),
 
            TP_fast_assign(
                           __entry->obj = obj;
                           __entry->gtt_offset = gtt_offset;
+                          __entry->mappable = mappable;
                           ),
 
-           TP_printk("obj=%p, gtt_offset=%08x",
-                     __entry->obj, __entry->gtt_offset)
+           TP_printk("obj=%p, gtt_offset=%08x%s",
+                     __entry->obj, __entry->gtt_offset,
+                     __entry->mappable ? ", mappable" : "")
 );
 
 TRACE_EVENT(i915_gem_object_change_domain,