@@ -46,6 +46,11 @@ enum {
PINNED_LIST,
};
+enum {
+ NO_CONTEXT_DUMP,
+ CONTEXT_DUMP,
+};
+
static const char *yesno(int v)
{
return v ? "yes" : "no";
@@ -120,6 +125,51 @@ static inline const char *get_global_flag(struct drm_i915_gem_object *obj)
}
static void
+dump_32_obj(struct seq_file *m, struct drm_i915_gem_object *obj)
+{
+ struct page *page;
+ size_t size; /* In bytes */
+ size_t start_dword, end_dword, end_row_dword; /* In uint32_t offsets */
+ int i, num_pages;
+ uint32_t *obj_ptr;
+
+ if (i915_gem_object_get_pages(obj))
+ return;
+
+ size = obj->base.size; /* In bytes */
+ num_pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
+
+ for (i = 0; i < num_pages; i++) {
+ page = i915_gem_object_get_page(obj, i);
+ drm_clflush_pages(&page, 1);
+
+ start_dword = (i * PAGE_SIZE) / sizeof(uint32_t);
+ end_dword = start_dword + (PAGE_SIZE / sizeof(uint32_t));
+ if ((end_dword * sizeof(uint32_t)) > size)
+ end_dword = size / sizeof(uint32_t);
+
+ obj_ptr = (uint32_t *)kmap_atomic(page);
+
+ while (start_dword < end_dword) {
+ end_row_dword = start_dword + 8;
+ if (end_row_dword > end_dword)
+ end_row_dword = end_dword;
+ seq_printf(m, "0x%08lx: ",
+ start_dword * sizeof(uint32_t));
+ while (start_dword < end_row_dword) {
+ seq_printf(m, "0x%08x ",
+ *(obj_ptr +
+ (start_dword & (PAGE_SIZE - 1))));
+ start_dword++;
+ }
+ seq_puts(m, "\n");
+ }
+
+ kunmap_atomic(obj_ptr);
+ }
+}
+
+static void
describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)
{
struct i915_vma *vma;
@@ -1709,9 +1759,10 @@ static void describe_ctx_ringbuf(struct seq_file *m,
ringbuf->last_retired_head);
}
-static int i915_context_status(struct seq_file *m, void *unused)
+static int i915_context_status(struct seq_file *m, void *data)
{
struct drm_info_node *node = m->private;
+ uintptr_t dump_flag = (uintptr_t) node->info_ent->data;
struct drm_device *dev = node->minor->dev;
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_engine_cs *ring;
@@ -1758,8 +1809,16 @@ static int i915_context_status(struct seq_file *m, void *unused)
seq_printf(m, "%s: ", ring->name);
if (ctx_obj)
describe_obj(m, ctx_obj);
+
if (ringbuf)
describe_ctx_ringbuf(m, ringbuf);
+
+ if (ctx_obj &&
+ (dump_flag == CONTEXT_DUMP)) {
+ seq_puts(m, "\nContext Dump:\n");
+ dump_32_obj(m, ctx_obj);
+ }
+
seq_putc(m, '\n');
}
} else {
@@ -4170,7 +4229,8 @@ static const struct drm_info_list i915_debugfs_list[] = {
{"i915_sr_status", i915_sr_status, 0},
{"i915_opregion", i915_opregion, 0},
{"i915_gem_framebuffer", i915_gem_framebuffer_info, 0},
- {"i915_context_status", i915_context_status, 0},
+ {"i915_context_status", i915_context_status, 0, (void *)NO_CONTEXT_DUMP},
+ {"i915_context_dump", i915_context_status, 0, (void *)CONTEXT_DUMP},
{"i915_dump_lrc", i915_dump_lrc, 0},
{"i915_execlists", i915_execlists, 0},
{"i915_gen6_forcewake_count", i915_gen6_forcewake_count_info, 0},