]> asedeno.scripts.mit.edu Git - linux.git/blobdiff - drivers/gpu/drm/i915/i915_trace.h
drm/i915: Add g4x watermark tracepoint
[linux.git] / drivers / gpu / drm / i915 / i915_trace.h
index 4461df5a94feac71e65e8c4d1cc6d326492019a6..b24a83d435592bde89236f12c218f747d1632e04 100644 (file)
 #define TRACE_SYSTEM i915
 #define TRACE_INCLUDE_FILE i915_trace
 
+/* watermark/fifo updates */
+
+TRACE_EVENT(intel_cpu_fifo_underrun,
+           TP_PROTO(struct drm_i915_private *dev_priv, enum pipe pipe),
+           TP_ARGS(dev_priv, pipe),
+
+           TP_STRUCT__entry(
+                            __field(enum pipe, pipe)
+                            __field(u32, frame)
+                            __field(u32, scanline)
+                            ),
+
+           TP_fast_assign(
+                          __entry->pipe = pipe;
+                          __entry->frame = dev_priv->drm.driver->get_vblank_counter(&dev_priv->drm, pipe);
+                          __entry->scanline = intel_get_crtc_scanline(intel_get_crtc_for_pipe(dev_priv, pipe));
+                          ),
+
+           TP_printk("pipe %c, frame=%u, scanline=%u",
+                     pipe_name(__entry->pipe),
+                     __entry->frame, __entry->scanline)
+);
+
+TRACE_EVENT(intel_pch_fifo_underrun,
+           TP_PROTO(struct drm_i915_private *dev_priv, enum transcoder pch_transcoder),
+           TP_ARGS(dev_priv, pch_transcoder),
+
+           TP_STRUCT__entry(
+                            __field(enum pipe, pipe)
+                            __field(u32, frame)
+                            __field(u32, scanline)
+                            ),
+
+           TP_fast_assign(
+                          enum pipe pipe = (enum pipe)pch_transcoder;
+                          __entry->pipe = pipe;
+                          __entry->frame = dev_priv->drm.driver->get_vblank_counter(&dev_priv->drm, pipe);
+                          __entry->scanline = intel_get_crtc_scanline(intel_get_crtc_for_pipe(dev_priv, pipe));
+                          ),
+
+           TP_printk("pch transcoder %c, frame=%u, scanline=%u",
+                     pipe_name(__entry->pipe),
+                     __entry->frame, __entry->scanline)
+);
+
+TRACE_EVENT(intel_memory_cxsr,
+           TP_PROTO(struct drm_i915_private *dev_priv, bool old, bool new),
+           TP_ARGS(dev_priv, old, new),
+
+           TP_STRUCT__entry(
+                            __array(u32, frame, 3)
+                            __array(u32, scanline, 3)
+                            __field(bool, old)
+                            __field(bool, new)
+                            ),
+
+           TP_fast_assign(
+                          enum pipe pipe;
+                          for_each_pipe(dev_priv, pipe) {
+                                  __entry->frame[pipe] =
+                                          dev_priv->drm.driver->get_vblank_counter(&dev_priv->drm, pipe);
+                                  __entry->scanline[pipe] =
+                                          intel_get_crtc_scanline(intel_get_crtc_for_pipe(dev_priv, pipe));
+                          }
+                          __entry->old = old;
+                          __entry->new = new;
+                          ),
+
+           TP_printk("%s->%s, pipe A: frame=%u, scanline=%u, pipe B: frame=%u, scanline=%u, pipe C: frame=%u, scanline=%u",
+                     onoff(__entry->old), onoff(__entry->new),
+                     __entry->frame[PIPE_A], __entry->scanline[PIPE_A],
+                     __entry->frame[PIPE_B], __entry->scanline[PIPE_B],
+                     __entry->frame[PIPE_C], __entry->scanline[PIPE_C])
+);
+
+TRACE_EVENT(g4x_wm,
+           TP_PROTO(struct intel_crtc *crtc, const struct g4x_wm_values *wm),
+           TP_ARGS(crtc, wm),
+
+           TP_STRUCT__entry(
+                            __field(enum pipe, pipe)
+                            __field(u32, frame)
+                            __field(u32, scanline)
+                            __field(u16, primary)
+                            __field(u16, sprite)
+                            __field(u16, cursor)
+                            __field(u16, sr_plane)
+                            __field(u16, sr_cursor)
+                            __field(u16, sr_fbc)
+                            __field(u16, hpll_plane)
+                            __field(u16, hpll_cursor)
+                            __field(u16, hpll_fbc)
+                            __field(bool, cxsr)
+                            __field(bool, hpll)
+                            __field(bool, fbc)
+                            ),
+
+           TP_fast_assign(
+                          __entry->pipe = crtc->pipe;
+                          __entry->frame = crtc->base.dev->driver->get_vblank_counter(crtc->base.dev,
+                                                                                      crtc->pipe);
+                          __entry->scanline = intel_get_crtc_scanline(crtc);
+                          __entry->primary = wm->pipe[crtc->pipe].plane[PLANE_PRIMARY];
+                          __entry->sprite = wm->pipe[crtc->pipe].plane[PLANE_SPRITE0];
+                          __entry->cursor = wm->pipe[crtc->pipe].plane[PLANE_CURSOR];
+                          __entry->sr_plane = wm->sr.plane;
+                          __entry->sr_cursor = wm->sr.cursor;
+                          __entry->sr_fbc = wm->sr.fbc;
+                          __entry->hpll_plane = wm->hpll.plane;
+                          __entry->hpll_cursor = wm->hpll.cursor;
+                          __entry->hpll_fbc = wm->hpll.fbc;
+                          __entry->cxsr = wm->cxsr;
+                          __entry->hpll = wm->hpll_en;
+                          __entry->fbc = wm->fbc_en;
+                          ),
+
+           TP_printk("pipe %c, frame=%u, scanline=%u, wm %d/%d/%d, sr %s/%d/%d/%d, hpll %s/%d/%d/%d, fbc %s",
+                     pipe_name(__entry->pipe), __entry->frame, __entry->scanline,
+                     __entry->primary, __entry->sprite, __entry->cursor,
+                     yesno(__entry->cxsr), __entry->sr_plane, __entry->sr_cursor, __entry->sr_fbc,
+                     yesno(__entry->hpll), __entry->hpll_plane, __entry->hpll_cursor, __entry->hpll_fbc,
+                     yesno(__entry->fbc))
+);
+
+TRACE_EVENT(vlv_wm,
+           TP_PROTO(struct intel_crtc *crtc, const struct vlv_wm_values *wm),
+           TP_ARGS(crtc, wm),
+
+           TP_STRUCT__entry(
+                            __field(enum pipe, pipe)
+                            __field(u32, frame)
+                            __field(u32, scanline)
+                            __field(u32, level)
+                            __field(u32, cxsr)
+                            __field(u32, primary)
+                            __field(u32, sprite0)
+                            __field(u32, sprite1)
+                            __field(u32, cursor)
+                            __field(u32, sr_plane)
+                            __field(u32, sr_cursor)
+                            ),
+
+           TP_fast_assign(
+                          __entry->pipe = crtc->pipe;
+                          __entry->frame = crtc->base.dev->driver->get_vblank_counter(crtc->base.dev,
+                                                                                      crtc->pipe);
+                          __entry->scanline = intel_get_crtc_scanline(crtc);
+                          __entry->level = wm->level;
+                          __entry->cxsr = wm->cxsr;
+                          __entry->primary = wm->pipe[crtc->pipe].plane[PLANE_PRIMARY];
+                          __entry->sprite0 = wm->pipe[crtc->pipe].plane[PLANE_SPRITE0];
+                          __entry->sprite1 = wm->pipe[crtc->pipe].plane[PLANE_SPRITE1];
+                          __entry->cursor = wm->pipe[crtc->pipe].plane[PLANE_CURSOR];
+                          __entry->sr_plane = wm->sr.plane;
+                          __entry->sr_cursor = wm->sr.cursor;
+                          ),
+
+           TP_printk("pipe %c, frame=%u, scanline=%u, level=%d, cxsr=%d, wm %d/%d/%d/%d, sr %d/%d",
+                     pipe_name(__entry->pipe), __entry->frame,
+                     __entry->scanline, __entry->level, __entry->cxsr,
+                     __entry->primary, __entry->sprite0, __entry->sprite1, __entry->cursor,
+                     __entry->sr_plane, __entry->sr_cursor)
+);
+
+TRACE_EVENT(vlv_fifo_size,
+           TP_PROTO(struct intel_crtc *crtc, u32 sprite0_start, u32 sprite1_start, u32 fifo_size),
+           TP_ARGS(crtc, sprite0_start, sprite1_start, fifo_size),
+
+           TP_STRUCT__entry(
+                            __field(enum pipe, pipe)
+                            __field(u32, frame)
+                            __field(u32, scanline)
+                            __field(u32, sprite0_start)
+                            __field(u32, sprite1_start)
+                            __field(u32, fifo_size)
+                            ),
+
+           TP_fast_assign(
+                          __entry->pipe = crtc->pipe;
+                          __entry->frame = crtc->base.dev->driver->get_vblank_counter(crtc->base.dev,
+                                                                                      crtc->pipe);
+                          __entry->scanline = intel_get_crtc_scanline(crtc);
+                          __entry->sprite0_start = sprite0_start;
+                          __entry->sprite1_start = sprite1_start;
+                          __entry->fifo_size = fifo_size;
+                          ),
+
+           TP_printk("pipe %c, frame=%u, scanline=%u, %d/%d/%d",
+                     pipe_name(__entry->pipe), __entry->frame,
+                     __entry->scanline, __entry->sprite0_start,
+                     __entry->sprite1_start, __entry->fifo_size)
+);
+
+/* plane updates */
+
+TRACE_EVENT(intel_update_plane,
+           TP_PROTO(struct drm_plane *plane, struct intel_crtc *crtc),
+           TP_ARGS(plane, crtc),
+
+           TP_STRUCT__entry(
+                            __field(enum pipe, pipe)
+                            __field(const char *, name)
+                            __field(u32, frame)
+                            __field(u32, scanline)
+                            __array(int, src, 4)
+                            __array(int, dst, 4)
+                            ),
+
+           TP_fast_assign(
+                          __entry->pipe = crtc->pipe;
+                          __entry->name = plane->name;
+                          __entry->frame = crtc->base.dev->driver->get_vblank_counter(crtc->base.dev,
+                                                                                      crtc->pipe);
+                          __entry->scanline = intel_get_crtc_scanline(crtc);
+                          memcpy(__entry->src, &plane->state->src, sizeof(__entry->src));
+                          memcpy(__entry->dst, &plane->state->dst, sizeof(__entry->dst));
+                          ),
+
+           TP_printk("pipe %c, plane %s, frame=%u, scanline=%u, " DRM_RECT_FP_FMT " -> " DRM_RECT_FMT,
+                     pipe_name(__entry->pipe), __entry->name,
+                     __entry->frame, __entry->scanline,
+                     DRM_RECT_FP_ARG((const struct drm_rect *)__entry->src),
+                     DRM_RECT_ARG((const struct drm_rect *)__entry->dst))
+);
+
+TRACE_EVENT(intel_disable_plane,
+           TP_PROTO(struct drm_plane *plane, struct intel_crtc *crtc),
+           TP_ARGS(plane, crtc),
+
+           TP_STRUCT__entry(
+                            __field(enum pipe, pipe)
+                            __field(const char *, name)
+                            __field(u32, frame)
+                            __field(u32, scanline)
+                            ),
+
+           TP_fast_assign(
+                          __entry->pipe = crtc->pipe;
+                          __entry->name = plane->name;
+                          __entry->frame = crtc->base.dev->driver->get_vblank_counter(crtc->base.dev,
+                                                                                      crtc->pipe);
+                          __entry->scanline = intel_get_crtc_scanline(crtc);
+                          ),
+
+           TP_printk("pipe %c, plane %s, frame=%u, scanline=%u",
+                     pipe_name(__entry->pipe), __entry->name,
+                     __entry->frame, __entry->scanline)
+);
+
 /* pipe updates */
 
 TRACE_EVENT(i915_pipe_update_start,
@@ -175,134 +424,6 @@ TRACE_EVENT(i915_vma_unbind,
                      __entry->obj, __entry->offset, __entry->size, __entry->vm)
 );
 
-TRACE_EVENT(i915_va_alloc,
-       TP_PROTO(struct i915_vma *vma),
-       TP_ARGS(vma),
-
-       TP_STRUCT__entry(
-               __field(struct i915_address_space *, vm)
-               __field(u64, start)
-               __field(u64, end)
-       ),
-
-       TP_fast_assign(
-               __entry->vm = vma->vm;
-               __entry->start = vma->node.start;
-               __entry->end = vma->node.start + vma->node.size - 1;
-       ),
-
-       TP_printk("vm=%p (%c), 0x%llx-0x%llx",
-                 __entry->vm, i915_is_ggtt(__entry->vm) ? 'G' : 'P',  __entry->start, __entry->end)
-);
-
-DECLARE_EVENT_CLASS(i915_px_entry,
-       TP_PROTO(struct i915_address_space *vm, u32 px, u64 start, u64 px_shift),
-       TP_ARGS(vm, px, start, px_shift),
-
-       TP_STRUCT__entry(
-               __field(struct i915_address_space *, vm)
-               __field(u32, px)
-               __field(u64, start)
-               __field(u64, end)
-       ),
-
-       TP_fast_assign(
-               __entry->vm = vm;
-               __entry->px = px;
-               __entry->start = start;
-               __entry->end = ((start + (1ULL << px_shift)) & ~((1ULL << px_shift)-1)) - 1;
-       ),
-
-       TP_printk("vm=%p, pde=%d (0x%llx-0x%llx)",
-                 __entry->vm, __entry->px, __entry->start, __entry->end)
-);
-
-DEFINE_EVENT(i915_px_entry, i915_page_table_entry_alloc,
-            TP_PROTO(struct i915_address_space *vm, u32 pde, u64 start, u64 pde_shift),
-            TP_ARGS(vm, pde, start, pde_shift)
-);
-
-DEFINE_EVENT_PRINT(i915_px_entry, i915_page_directory_entry_alloc,
-                  TP_PROTO(struct i915_address_space *vm, u32 pdpe, u64 start, u64 pdpe_shift),
-                  TP_ARGS(vm, pdpe, start, pdpe_shift),
-
-                  TP_printk("vm=%p, pdpe=%d (0x%llx-0x%llx)",
-                            __entry->vm, __entry->px, __entry->start, __entry->end)
-);
-
-DEFINE_EVENT_PRINT(i915_px_entry, i915_page_directory_pointer_entry_alloc,
-                  TP_PROTO(struct i915_address_space *vm, u32 pml4e, u64 start, u64 pml4e_shift),
-                  TP_ARGS(vm, pml4e, start, pml4e_shift),
-
-                  TP_printk("vm=%p, pml4e=%d (0x%llx-0x%llx)",
-                            __entry->vm, __entry->px, __entry->start, __entry->end)
-);
-
-/* Avoid extra math because we only support two sizes. The format is defined by
- * bitmap_scnprintf. Each 32 bits is 8 HEX digits followed by comma */
-#define TRACE_PT_SIZE(bits) \
-       ((((bits) == 1024) ? 288 : 144) + 1)
-
-DECLARE_EVENT_CLASS(i915_page_table_entry_update,
-       TP_PROTO(struct i915_address_space *vm, u32 pde,
-                struct i915_page_table *pt, u32 first, u32 count, u32 bits),
-       TP_ARGS(vm, pde, pt, first, count, bits),
-
-       TP_STRUCT__entry(
-               __field(struct i915_address_space *, vm)
-               __field(u32, pde)
-               __field(u32, first)
-               __field(u32, last)
-               __dynamic_array(char, cur_ptes, TRACE_PT_SIZE(bits))
-       ),
-
-       TP_fast_assign(
-               __entry->vm = vm;
-               __entry->pde = pde;
-               __entry->first = first;
-               __entry->last = first + count - 1;
-               scnprintf(__get_str(cur_ptes),
-                         TRACE_PT_SIZE(bits),
-                         "%*pb",
-                         bits,
-                         pt->used_ptes);
-       ),
-
-       TP_printk("vm=%p, pde=%d, updating %u:%u\t%s",
-                 __entry->vm, __entry->pde, __entry->last, __entry->first,
-                 __get_str(cur_ptes))
-);
-
-DEFINE_EVENT(i915_page_table_entry_update, i915_page_table_entry_map,
-       TP_PROTO(struct i915_address_space *vm, u32 pde,
-                struct i915_page_table *pt, u32 first, u32 count, u32 bits),
-       TP_ARGS(vm, pde, pt, first, count, bits)
-);
-
-TRACE_EVENT(i915_gem_object_change_domain,
-           TP_PROTO(struct drm_i915_gem_object *obj, u32 old_read, u32 old_write),
-           TP_ARGS(obj, old_read, old_write),
-
-           TP_STRUCT__entry(
-                            __field(struct drm_i915_gem_object *, obj)
-                            __field(u32, read_domains)
-                            __field(u32, write_domain)
-                            ),
-
-           TP_fast_assign(
-                          __entry->obj = obj;
-                          __entry->read_domains = obj->base.read_domains | (old_read << 16);
-                          __entry->write_domain = obj->base.write_domain | (old_write << 16);
-                          ),
-
-           TP_printk("obj=%p, read=%02x=>%02x, write=%02x=>%02x",
-                     __entry->obj,
-                     __entry->read_domains >> 16,
-                     __entry->read_domains & 0xffff,
-                     __entry->write_domain >> 16,
-                     __entry->write_domain & 0xffff)
-);
-
 TRACE_EVENT(i915_gem_object_pwrite,
            TP_PROTO(struct drm_i915_gem_object *obj, u32 offset, u32 len),
            TP_ARGS(obj, offset, len),
@@ -503,13 +624,14 @@ TRACE_EVENT(i915_gem_ring_sync_to,
                      __entry->seqno)
 );
 
-TRACE_EVENT(i915_gem_ring_dispatch,
+TRACE_EVENT(i915_gem_request_queue,
            TP_PROTO(struct drm_i915_gem_request *req, u32 flags),
            TP_ARGS(req, flags),
 
            TP_STRUCT__entry(
                             __field(u32, dev)
                             __field(u32, ring)
+                            __field(u32, ctx)
                             __field(u32, seqno)
                             __field(u32, flags)
                             ),
@@ -517,13 +639,14 @@ TRACE_EVENT(i915_gem_ring_dispatch,
            TP_fast_assign(
                           __entry->dev = req->i915->drm.primary->index;
                           __entry->ring = req->engine->id;
-                          __entry->seqno = req->global_seqno;
+                          __entry->ctx = req->fence.context;
+                          __entry->seqno = req->fence.seqno;
                           __entry->flags = flags;
-                          dma_fence_enable_sw_signaling(&req->fence);
                           ),
 
-           TP_printk("dev=%u, ring=%u, seqno=%u, flags=%x",
-                     __entry->dev, __entry->ring, __entry->seqno, __entry->flags)
+           TP_printk("dev=%u, ring=%u, ctx=%u, seqno=%u, flags=0x%x",
+                     __entry->dev, __entry->ring, __entry->ctx, __entry->seqno,
+                     __entry->flags)
 );
 
 TRACE_EVENT(i915_gem_ring_flush,
@@ -555,18 +678,23 @@ DECLARE_EVENT_CLASS(i915_gem_request,
 
            TP_STRUCT__entry(
                             __field(u32, dev)
+                            __field(u32, ctx)
                             __field(u32, ring)
                             __field(u32, seqno)
+                            __field(u32, global)
                             ),
 
            TP_fast_assign(
                           __entry->dev = req->i915->drm.primary->index;
                           __entry->ring = req->engine->id;
-                          __entry->seqno = req->global_seqno;
+                          __entry->ctx = req->fence.context;
+                          __entry->seqno = req->fence.seqno;
+                          __entry->global = req->global_seqno;
                           ),
 
-           TP_printk("dev=%u, ring=%u, seqno=%u",
-                     __entry->dev, __entry->ring, __entry->seqno)
+           TP_printk("dev=%u, ring=%u, ctx=%u, seqno=%u, global=%u",
+                     __entry->dev, __entry->ring, __entry->ctx, __entry->seqno,
+                     __entry->global)
 );
 
 DEFINE_EVENT(i915_gem_request, i915_gem_request_add,
@@ -574,24 +702,100 @@ DEFINE_EVENT(i915_gem_request, i915_gem_request_add,
            TP_ARGS(req)
 );
 
-TRACE_EVENT(i915_gem_request_notify,
-           TP_PROTO(struct intel_engine_cs *engine),
-           TP_ARGS(engine),
+#if defined(CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS)
+DEFINE_EVENT(i915_gem_request, i915_gem_request_submit,
+            TP_PROTO(struct drm_i915_gem_request *req),
+            TP_ARGS(req)
+);
+
+DEFINE_EVENT(i915_gem_request, i915_gem_request_execute,
+            TP_PROTO(struct drm_i915_gem_request *req),
+            TP_ARGS(req)
+);
+
+DECLARE_EVENT_CLASS(i915_gem_request_hw,
+                   TP_PROTO(struct drm_i915_gem_request *req,
+                            unsigned int port),
+                   TP_ARGS(req, port),
+
+                   TP_STRUCT__entry(
+                                    __field(u32, dev)
+                                    __field(u32, ring)
+                                    __field(u32, seqno)
+                                    __field(u32, global_seqno)
+                                    __field(u32, ctx)
+                                    __field(u32, port)
+                                   ),
+
+                   TP_fast_assign(
+                                  __entry->dev = req->i915->drm.primary->index;
+                                  __entry->ring = req->engine->id;
+                                  __entry->ctx = req->fence.context;
+                                  __entry->seqno = req->fence.seqno;
+                                  __entry->global_seqno = req->global_seqno;
+                                  __entry->port = port;
+                                 ),
+
+                   TP_printk("dev=%u, ring=%u, ctx=%u, seqno=%u, global=%u, port=%u",
+                             __entry->dev, __entry->ring, __entry->ctx,
+                             __entry->seqno, __entry->global_seqno,
+                             __entry->port)
+);
+
+DEFINE_EVENT(i915_gem_request_hw, i915_gem_request_in,
+            TP_PROTO(struct drm_i915_gem_request *req, unsigned int port),
+            TP_ARGS(req, port)
+);
+
+DEFINE_EVENT(i915_gem_request, i915_gem_request_out,
+            TP_PROTO(struct drm_i915_gem_request *req),
+            TP_ARGS(req)
+);
+#else
+#if !defined(TRACE_HEADER_MULTI_READ)
+static inline void
+trace_i915_gem_request_submit(struct drm_i915_gem_request *req)
+{
+}
+
+static inline void
+trace_i915_gem_request_execute(struct drm_i915_gem_request *req)
+{
+}
+
+static inline void
+trace_i915_gem_request_in(struct drm_i915_gem_request *req, unsigned int port)
+{
+}
+
+static inline void
+trace_i915_gem_request_out(struct drm_i915_gem_request *req)
+{
+}
+#endif
+#endif
+
+TRACE_EVENT(intel_engine_notify,
+           TP_PROTO(struct intel_engine_cs *engine, bool waiters),
+           TP_ARGS(engine, waiters),
 
            TP_STRUCT__entry(
                             __field(u32, dev)
                             __field(u32, ring)
                             __field(u32, seqno)
+                            __field(bool, waiters)
                             ),
 
            TP_fast_assign(
                           __entry->dev = engine->i915->drm.primary->index;
                           __entry->ring = engine->id;
                           __entry->seqno = intel_engine_get_seqno(engine);
+                          __entry->waiters = waiters;
                           ),
 
-           TP_printk("dev=%u, ring=%u, seqno=%u",
-                     __entry->dev, __entry->ring, __entry->seqno)
+           TP_printk("dev=%u, ring=%u, seqno=%u, waiters=%u",
+                     __entry->dev, __entry->ring, __entry->seqno,
+                     __entry->waiters)
 );
 
 DEFINE_EVENT(i915_gem_request, i915_gem_request_retire,
@@ -599,20 +803,17 @@ DEFINE_EVENT(i915_gem_request, i915_gem_request_retire,
            TP_ARGS(req)
 );
 
-DEFINE_EVENT(i915_gem_request, i915_gem_request_complete,
-           TP_PROTO(struct drm_i915_gem_request *req),
-           TP_ARGS(req)
-);
-
 TRACE_EVENT(i915_gem_request_wait_begin,
-           TP_PROTO(struct drm_i915_gem_request *req),
-           TP_ARGS(req),
+           TP_PROTO(struct drm_i915_gem_request *req, unsigned int flags),
+           TP_ARGS(req, flags),
 
            TP_STRUCT__entry(
                             __field(u32, dev)
                             __field(u32, ring)
+                            __field(u32, ctx)
                             __field(u32, seqno)
-                            __field(bool, blocking)
+                            __field(u32, global)
+                            __field(unsigned int, flags)
                             ),
 
            /* NB: the blocking information is racy since mutex_is_locked
@@ -624,14 +825,16 @@ TRACE_EVENT(i915_gem_request_wait_begin,
            TP_fast_assign(
                           __entry->dev = req->i915->drm.primary->index;
                           __entry->ring = req->engine->id;
-                          __entry->seqno = req->global_seqno;
-                          __entry->blocking =
-                                    mutex_is_locked(&req->i915->drm.struct_mutex);
+                          __entry->ctx = req->fence.context;
+                          __entry->seqno = req->fence.seqno;
+                          __entry->global = req->global_seqno;
+                          __entry->flags = flags;
                           ),
 
-           TP_printk("dev=%u, ring=%u, seqno=%u, blocking=%s",
-                     __entry->dev, __entry->ring,
-                     __entry->seqno, __entry->blocking ?  "yes (NB)" : "no")
+           TP_printk("dev=%u, ring=%u, ctx=%u, seqno=%u, global=%u, blocking=%u, flags=0x%x",
+                     __entry->dev, __entry->ring, __entry->ctx, __entry->seqno,
+                     __entry->global, !!(__entry->flags & I915_WAIT_LOCKED),
+                     __entry->flags)
 );
 
 DEFINE_EVENT(i915_gem_request, i915_gem_request_wait_end,
@@ -769,17 +972,19 @@ DECLARE_EVENT_CLASS(i915_context,
        TP_STRUCT__entry(
                        __field(u32, dev)
                        __field(struct i915_gem_context *, ctx)
+                       __field(u32, hw_id)
                        __field(struct i915_address_space *, vm)
        ),
 
        TP_fast_assign(
+                       __entry->dev = ctx->i915->drm.primary->index;
                        __entry->ctx = ctx;
+                       __entry->hw_id = ctx->hw_id;
                        __entry->vm = ctx->ppgtt ? &ctx->ppgtt->base : NULL;
-                       __entry->dev = ctx->i915->drm.primary->index;
        ),
 
-       TP_printk("dev=%u, ctx=%p, ctx_vm=%p",
-                 __entry->dev, __entry->ctx, __entry->vm)
+       TP_printk("dev=%u, ctx=%p, ctx_vm=%p, hw_id=%u",
+                 __entry->dev, __entry->ctx, __entry->vm, __entry->hw_id)
 )
 
 DEFINE_EVENT(i915_context, i915_context_create,