aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c2
-rw-r--r--drivers/gpu/drm/i915/i915_trace.h11
2 files changed, 8 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 6d9971f0ed92..bb5435ba01aa 100644
--- 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,
2775 BUG_ON(obj->write_domain & I915_GEM_GPU_DOMAINS); 2775 BUG_ON(obj->write_domain & I915_GEM_GPU_DOMAINS);
2776 2776
2777 obj_priv->gtt_offset = obj_priv->gtt_space->start; 2777 obj_priv->gtt_offset = obj_priv->gtt_space->start;
2778 trace_i915_gem_object_bind(obj, obj_priv->gtt_offset); 2778 trace_i915_gem_object_bind(obj, obj_priv->gtt_offset, mappable);
2779 2779
2780 return 0; 2780 return 0;
2781} 2781}
diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
index fea97a21cc14..0b1049ff72a3 100644
--- 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,
35 35
36TRACE_EVENT(i915_gem_object_bind, 36TRACE_EVENT(i915_gem_object_bind,
37 37
38 TP_PROTO(struct drm_gem_object *obj, u32 gtt_offset), 38 TP_PROTO(struct drm_gem_object *obj, u32 gtt_offset, bool mappable),
39 39
40 TP_ARGS(obj, gtt_offset), 40 TP_ARGS(obj, gtt_offset, mappable),
41 41
42 TP_STRUCT__entry( 42 TP_STRUCT__entry(
43 __field(struct drm_gem_object *, obj) 43 __field(struct drm_gem_object *, obj)
44 __field(u32, gtt_offset) 44 __field(u32, gtt_offset)
45 __field(bool, mappable)
45 ), 46 ),
46 47
47 TP_fast_assign( 48 TP_fast_assign(
48 __entry->obj = obj; 49 __entry->obj = obj;
49 __entry->gtt_offset = gtt_offset; 50 __entry->gtt_offset = gtt_offset;
51 __entry->mappable = mappable;
50 ), 52 ),
51 53
52 TP_printk("obj=%p, gtt_offset=%08x", 54 TP_printk("obj=%p, gtt_offset=%08x%s",
53 __entry->obj, __entry->gtt_offset) 55 __entry->obj, __entry->gtt_offset,
56 __entry->mappable ? ", mappable" : "")
54); 57);
55 58
56TRACE_EVENT(i915_gem_object_change_domain, 59TRACE_EVENT(i915_gem_object_change_domain,