diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-09-18 13:03:26 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-09-30 04:20:14 -0400 |
commit | d3a93cbe47bfb49de2d517d68c7082cef176dbb9 (patch) | |
tree | 39c93185edd187edb4bb51dd6c8310e260e9232b | |
parent | 7e435ad2c263cf3fd51343b0754856f2d88b0cdb (diff) |
drm/i915: Always use GEN8_RING_PDP_{LDW, UDW} instead of hand rolling the register offsets
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 879771766973..007d8920eb2f 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c | |||
@@ -2231,10 +2231,9 @@ static void gen8_ppgtt_info(struct seq_file *m, struct drm_device *dev) | |||
2231 | for_each_ring(ring, dev_priv, unused) { | 2231 | for_each_ring(ring, dev_priv, unused) { |
2232 | seq_printf(m, "%s\n", ring->name); | 2232 | seq_printf(m, "%s\n", ring->name); |
2233 | for (i = 0; i < 4; i++) { | 2233 | for (i = 0; i < 4; i++) { |
2234 | u32 offset = 0x270 + i * 8; | 2234 | u64 pdp = I915_READ(GEN8_RING_PDP_UDW(ring, i)); |
2235 | u64 pdp = I915_READ(ring->mmio_base + offset + 4); | ||
2236 | pdp <<= 32; | 2235 | pdp <<= 32; |
2237 | pdp |= I915_READ(ring->mmio_base + offset); | 2236 | pdp |= I915_READ(GEN8_RING_PDP_LDW(ring, i)); |
2238 | seq_printf(m, "\tPDP%d 0x%016llx\n", i, pdp); | 2237 | seq_printf(m, "\tPDP%d 0x%016llx\n", i, pdp); |
2239 | } | 2238 | } |
2240 | } | 2239 | } |