aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-10-29 16:00:54 -0400
committerChris Wilson <chris@chris-wilson.co.uk>2010-10-29 16:00:54 -0400
commit4066c0ae13a8388b9f2a29cad60da330b578eff2 (patch)
treecd9655b3f8d55f1251359c2f06f0542e0e1aa823
parente380f60b22eddec7825224b8d788572c82b63161 (diff)
drm/i915/debugfs: Display the contents of the BLT and BSD status pages
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--drivers/gpu/drm/i915/i915_debugfs.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 70eec5aceabe..58cf60d89f68 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -445,10 +445,18 @@ static int i915_hws_info(struct seq_file *m, void *data)
445 struct drm_info_node *node = (struct drm_info_node *) m->private; 445 struct drm_info_node *node = (struct drm_info_node *) m->private;
446 struct drm_device *dev = node->minor->dev; 446 struct drm_device *dev = node->minor->dev;
447 drm_i915_private_t *dev_priv = dev->dev_private; 447 drm_i915_private_t *dev_priv = dev->dev_private;
448 int i; 448 struct intel_ring_buffer *ring;
449 volatile u32 *hws; 449 volatile u32 *hws;
450 int i;
451
452 switch ((uintptr_t)node->info_ent->data) {
453 case RENDER_RING: ring = &dev_priv->render_ring; break;
454 case BSD_RING: ring = &dev_priv->bsd_ring; break;
455 case BLT_RING: ring = &dev_priv->blt_ring; break;
456 default: return -EINVAL;
457 }
450 458
451 hws = (volatile u32 *)dev_priv->render_ring.status_page.page_addr; 459 hws = (volatile u32 *)ring->status_page.page_addr;
452 if (hws == NULL) 460 if (hws == NULL)
453 return 0; 461 return 0;
454 462
@@ -1087,7 +1095,9 @@ static struct drm_info_list i915_debugfs_list[] = {
1087 {"i915_gem_seqno", i915_gem_seqno_info, 0}, 1095 {"i915_gem_seqno", i915_gem_seqno_info, 0},
1088 {"i915_gem_fence_regs", i915_gem_fence_regs_info, 0}, 1096 {"i915_gem_fence_regs", i915_gem_fence_regs_info, 0},
1089 {"i915_gem_interrupt", i915_interrupt_info, 0}, 1097 {"i915_gem_interrupt", i915_interrupt_info, 0},
1090 {"i915_gem_hws", i915_hws_info, 0}, 1098 {"i915_gem_hws", i915_hws_info, 0, (void *)RENDER_RING},
1099 {"i915_gem_hws_blt", i915_hws_info, 0, (void *)BLT_RING},
1100 {"i915_gem_hws_bsd", i915_hws_info, 0, (void *)BSD_RING},
1091 {"i915_ringbuffer_data", i915_ringbuffer_data, 0, (void *)RENDER_RING}, 1101 {"i915_ringbuffer_data", i915_ringbuffer_data, 0, (void *)RENDER_RING},
1092 {"i915_ringbuffer_info", i915_ringbuffer_info, 0, (void *)RENDER_RING}, 1102 {"i915_ringbuffer_info", i915_ringbuffer_info, 0, (void *)RENDER_RING},
1093 {"i915_bsd_ringbuffer_data", i915_ringbuffer_data, 0, (void *)BSD_RING}, 1103 {"i915_bsd_ringbuffer_data", i915_ringbuffer_data, 0, (void *)BSD_RING},