---
drivers/gpu/drm/i915/i915_gem_debugfs.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gem_debugfs.c
b/drivers/gpu/drm/i915/i915_gem_debugfs.c
index cc91461..10ca9ae 100644
--- a/drivers/gpu/drm/i915/i915_gem_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_gem_debugfs.c
@@ -631,14 +631,12 @@ static void dump_cmds (struct seq_file *m,
(0x3f << 23) |
(0x7ff << 12) |
(1 << 11) |
- (1 << 7) |
(1 << 6) |
(0x3f << 0));
uint32_t batch_start_cmd = ((0x0 << 29) |
(0x31 << 23) |
(0x00 << 12) |
(0 << 11) |
- (1 << 7) |
(0 << 6) |
(0 << 0));
int count;
@@ -662,17 +660,19 @@ static void dump_cmds (struct seq_file *m,
/* check for MI_BATCH_BUFFER_START */
if ( (data & batch_start_mask) == batch_start_cmd) {
uint32_t batch = ptr[1] & ~3;
+ uint32_t addr_type = (ptr[0] & (1 << 7));
seq_printf(m, "\t%08x: %08x\n", (ring + 4) &
mask, batch);
- seq_printf(m, "Batch buffer at 0x%08x {\n",
batch);
+ seq_printf(m, "Batch buffer at 0x%08x (%s)
{\n", batch, addr_type ? "GfxMem" : "PhysMem");
/* TODO: Implement batch buffer dumping
dump_cmds(m, acthd);
ring = (ring + (count -1)*4) & mask;
- */
+ */
seq_printf(m, "}\n");
}
cmd = (cmd + count * 4) & mask;
} else
seq_printf(m, "\n");
+
ring = (ring + 4) & mask;
}
}
--
1.6.0.6
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
