diff options
| author | Eric Anholt <eric@anholt.net> | 2010-05-21 16:55:54 -0400 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-05-26 15:36:00 -0400 |
| commit | d3301d86b4bf2bcf649982ae464211d8bcf9575a (patch) | |
| tree | e3334543a973874297421d57a63f8c452ae76455 /drivers/gpu/drm/i915/i915_debugfs.c | |
| parent | 62fdfeaf8b1f487060b6e160e7b5cd90287607c9 (diff) | |
drm/i915: Rename dev_priv->ring to dev_priv->render_ring.
With the advent of the BSD ring, be clear about which ring this is.
The docs are pretty consistent with calling this the Render engine at
this point.
Diffstat (limited to 'drivers/gpu/drm/i915/i915_debugfs.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 322070c0c631..488175c70c7d 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c | |||
| @@ -317,14 +317,14 @@ static int i915_ringbuffer_data(struct seq_file *m, void *data) | |||
| 317 | u8 *virt; | 317 | u8 *virt; |
| 318 | uint32_t *ptr, off; | 318 | uint32_t *ptr, off; |
| 319 | 319 | ||
| 320 | if (!dev_priv->ring.ring_obj) { | 320 | if (!dev_priv->render_ring.ring_obj) { |
| 321 | seq_printf(m, "No ringbuffer setup\n"); | 321 | seq_printf(m, "No ringbuffer setup\n"); |
| 322 | return 0; | 322 | return 0; |
| 323 | } | 323 | } |
| 324 | 324 | ||
| 325 | virt = dev_priv->ring.virtual_start; | 325 | virt = dev_priv->render_ring.virtual_start; |
| 326 | 326 | ||
| 327 | for (off = 0; off < dev_priv->ring.Size; off += 4) { | 327 | for (off = 0; off < dev_priv->render_ring.Size; off += 4) { |
| 328 | ptr = (uint32_t *)(virt + off); | 328 | ptr = (uint32_t *)(virt + off); |
| 329 | seq_printf(m, "%08x : %08x\n", off, *ptr); | 329 | seq_printf(m, "%08x : %08x\n", off, *ptr); |
| 330 | } | 330 | } |
| @@ -344,7 +344,7 @@ static int i915_ringbuffer_info(struct seq_file *m, void *data) | |||
| 344 | 344 | ||
| 345 | seq_printf(m, "RingHead : %08x\n", head); | 345 | seq_printf(m, "RingHead : %08x\n", head); |
| 346 | seq_printf(m, "RingTail : %08x\n", tail); | 346 | seq_printf(m, "RingTail : %08x\n", tail); |
| 347 | seq_printf(m, "RingSize : %08lx\n", dev_priv->ring.Size); | 347 | seq_printf(m, "RingSize : %08lx\n", dev_priv->render_ring.Size); |
| 348 | seq_printf(m, "Acthd : %08x\n", I915_READ(IS_I965G(dev) ? ACTHD_I965 : ACTHD)); | 348 | seq_printf(m, "Acthd : %08x\n", I915_READ(IS_I965G(dev) ? ACTHD_I965 : ACTHD)); |
| 349 | 349 | ||
| 350 | return 0; | 350 | return 0; |