From: Ville Syrjälä Date: Fri, 18 Sep 2015 17:03:26 +0000 (+0300) Subject: drm/i915: Always use GEN8_RING_PDP_{LDW, UDW} instead of hand rolling the register... X-Git-Tag: MMI-PSA29.97-13-9~7427^2~45^2~1414 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d3a93cbe47bfb49de2d517d68c7082cef176dbb9;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drm/i915: Always use GEN8_RING_PDP_{LDW, UDW} instead of hand rolling the register offsets Signed-off-by: Ville Syrjälä Reviewed-by: Jani Nikula Signed-off-by: Daniel Vetter --- 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) for_each_ring(ring, dev_priv, unused) { seq_printf(m, "%s\n", ring->name); for (i = 0; i < 4; i++) { - u32 offset = 0x270 + i * 8; - u64 pdp = I915_READ(ring->mmio_base + offset + 4); + u64 pdp = I915_READ(GEN8_RING_PDP_UDW(ring, i)); pdp <<= 32; - pdp |= I915_READ(ring->mmio_base + offset); + pdp |= I915_READ(GEN8_RING_PDP_LDW(ring, i)); seq_printf(m, "\tPDP%d 0x%016llx\n", i, pdp); } }