3 files changed, 4 insertions, 2 deletions

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index d226f2f2f7bc..2a1f0d7de0f2 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -757,8 +757,8 @@ static void i915_ring_error_state(struct seq_file *m,
         if (INTEL_INFO(dev)->gen >= 4)
                 seq_printf(m, "  INSTPS: 0x%08x\n", error->instps[ring]);
         seq_printf(m, "  INSTPM: 0x%08x\n", error->instpm[ring]);
+        seq_printf(m, "  FADDR: 0x%08x\n", error->faddr[ring]);
         if (INTEL_INFO(dev)->gen >= 6) {
-                seq_printf(m, "  FADDR: 0x%08x\n", error->faddr[ring]);
                 seq_printf(m, "  FAULT_REG: 0x%08x\n", error->fault_reg[ring]);
                 seq_printf(m, "  SYNC_0: 0x%08x\n",
                            error->semaphore_mboxes[ring][0]);
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 6d76ee54278b..febddc2952fb 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1029,7 +1029,6 @@ static void i915_record_ring_state(struct drm_device *dev,
         struct drm_i915_private *dev_priv = dev->dev_private;
 
         if (INTEL_INFO(dev)->gen >= 6) {
-                error->faddr[ring->id] = I915_READ(RING_DMA_FADD(ring->mmio_base));
                 error->fault_reg[ring->id] = I915_READ(RING_FAULT_REG(ring));
                 error->semaphore_mboxes[ring->id][0]
                         = I915_READ(RING_SYNC_0(ring->mmio_base));
@@ -1038,6 +1037,7 @@ static void i915_record_ring_state(struct drm_device *dev,
         }
 
         if (INTEL_INFO(dev)->gen >= 4) {
+                error->faddr[ring->id] = I915_READ(RING_DMA_FADD(ring->mmio_base));
                 error->ipeir[ring->id] = I915_READ(RING_IPEIR(ring->mmio_base));
                 error->ipehr[ring->id] = I915_READ(RING_IPEHR(ring->mmio_base));
                 error->instdone[ring->id] = I915_READ(RING_INSTDONE(ring->mmio_base));
@@ -1047,6 +1047,7 @@ static void i915_record_ring_state(struct drm_device *dev,
                         error->bbaddr = I915_READ64(BB_ADDR);
                 }
         } else {
+                error->faddr[ring->id] = I915_READ(DMA_FADD_I8XX);
                 error->ipeir[ring->id] = I915_READ(IPEIR);
                 error->ipehr[ring->id] = I915_READ(IPEHR);
                 error->instdone[ring->id] = I915_READ(INSTDONE);
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 56d4db8026e3..cb554444e862 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -474,6 +474,7 @@
 #define INSTDONE        0x02090
 #define NOPID           0x02094
 #define HWSTAM          0x02098
+#define DMA_FADD_I8XX   0x020d0
 
 #define ERROR_GEN6      0x040a0