OSDN Git Service

drm/i915: Dump w/a lists on all engines
authorChris Wilson <chris@chris-wilson.co.uk>
Wed, 3 Jul 2019 13:58:04 +0000 (14:58 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 4 Jul 2019 18:22:10 +0000 (19:22 +0100)
We store separate wa_list on every engine, so be sure to include all
when dumping the current set via debugfs.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190703135805.7310-1-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/i915_debugfs.c

index 6340cec..fa8ff27 100644 (file)
@@ -2960,14 +2960,28 @@ static int i915_shared_dplls_info(struct seq_file *m, void *unused)
 static int i915_wa_registers(struct seq_file *m, void *unused)
 {
        struct drm_i915_private *i915 = node_to_i915(m->private);
-       const struct i915_wa_list *wal = &i915->engine[RCS0]->ctx_wa_list;
-       struct i915_wa *wa;
-       unsigned int i;
+       struct intel_engine_cs *engine;
+       enum intel_engine_id id;
 
-       seq_printf(m, "Workarounds applied: %u\n", wal->count);
-       for (i = 0, wa = wal->list; i < wal->count; i++, wa++)
-               seq_printf(m, "0x%X: 0x%08X, mask: 0x%08X\n",
-                          i915_mmio_reg_offset(wa->reg), wa->val, wa->mask);
+       for_each_engine(engine, i915, id) {
+               const struct i915_wa_list *wal = &engine->ctx_wa_list;
+               const struct i915_wa *wa;
+               unsigned int count;
+
+               count = wal->count;
+               if (!count)
+                       continue;
+
+               seq_printf(m, "%s: Workarounds applied: %u\n",
+                          engine->name, count);
+
+               for (wa = wal->list; count--; wa++)
+                       seq_printf(m, "0x%X: 0x%08X, mask: 0x%08X\n",
+                                  i915_mmio_reg_offset(wa->reg),
+                                  wa->val, wa->mask);
+
+               seq_printf(m, "\n");
+       }
 
        return 0;
 }