1 files changed, 40 insertions, 6 deletions

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index dae364f0028c..79dcb8f896c6 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -215,6 +215,24 @@ static void print_error_buffers(struct drm_i915_error_state_buf *m,
         }
 }
 
+static const char *hangcheck_action_to_str(enum intel_ring_hangcheck_action a)
+{
+        switch (a) {
+        case HANGCHECK_IDLE:
+                return "idle";
+        case HANGCHECK_WAIT:
+                return "wait";
+        case HANGCHECK_ACTIVE:
+                return "active";
+        case HANGCHECK_KICK:
+                return "kick";
+        case HANGCHECK_HUNG:
+                return "hung";
+        }
+
+        return "unknown";
+}
+
 static void i915_ring_error_state(struct drm_i915_error_state_buf *m,
                                   struct drm_device *dev,
                                   struct drm_i915_error_state *error,
@@ -231,7 +249,8 @@ static void i915_ring_error_state(struct drm_i915_error_state_buf *m,
         err_printf(m, "  INSTDONE: 0x%08x\n", error->instdone[ring]);
         if (ring == RCS && INTEL_INFO(dev)->gen >= 4)
                 err_printf(m, "  BBADDR: 0x%08llx\n", error->bbaddr);
-
+        if (INTEL_INFO(dev)->gen >= 4)
+                err_printf(m, "  BB_STATE: 0x%08x\n", error->bbstate[ring]);
         if (INTEL_INFO(dev)->gen >= 4)
                 err_printf(m, "  INSTPS: 0x%08x\n", error->instps[ring]);
         err_printf(m, "  INSTPM: 0x%08x\n", error->instpm[ring]);
@@ -255,6 +274,9 @@ static void i915_ring_error_state(struct drm_i915_error_state_buf *m,
         err_printf(m, "  waiting: %s\n", yesno(error->waiting[ring]));
         err_printf(m, "  ring->head: 0x%08x\n", error->cpu_ring_head[ring]);
         err_printf(m, "  ring->tail: 0x%08x\n", error->cpu_ring_tail[ring]);
+        err_printf(m, "  hangcheck: %s [%d]\n",
+                   hangcheck_action_to_str(error->hangcheck_action[ring]),
+                   error->hangcheck_score[ring]);
 }
 
 void i915_error_printf(struct drm_i915_error_state_buf *e, const char *f, ...)
@@ -283,13 +305,14 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
         err_printf(m, "Time: %ld s %ld us\n", error->time.tv_sec,
                    error->time.tv_usec);
         err_printf(m, "Kernel: " UTS_RELEASE "\n");
-        err_printf(m, "PCI ID: 0x%04x\n", dev->pci_device);
+        err_printf(m, "PCI ID: 0x%04x\n", dev->pdev->device);
         err_printf(m, "EIR: 0x%08x\n", error->eir);
         err_printf(m, "IER: 0x%08x\n", error->ier);
         err_printf(m, "PGTBL_ER: 0x%08x\n", error->pgtbl_er);
         err_printf(m, "FORCEWAKE: 0x%08x\n", error->forcewake);
         err_printf(m, "DERRMR: 0x%08x\n", error->derrmr);
         err_printf(m, "CCID: 0x%08x\n", error->ccid);
+        err_printf(m, "Missed interrupts: 0x%08lx\n", dev_priv->gpu_error.missed_irq_rings);
 
         for (i = 0; i < dev_priv->num_fence_regs; i++)
                 err_printf(m, "  fence[%d] = %08llx\n", i, error->fence[i]);
@@ -601,6 +624,7 @@ static void i915_gem_record_fences(struct drm_device *dev,
 
         /* Fences */
         switch (INTEL_INFO(dev)->gen) {
+        case 8:
         case 7:
         case 6:
                 for (i = 0; i < dev_priv->num_fence_regs; i++)
@@ -703,6 +727,7 @@ static void i915_record_ring_state(struct drm_device *dev,
                 error->instps[ring->id] = I915_READ(RING_INSTPS(ring->mmio_base));
                 if (ring->id == RCS)
                         error->bbaddr = I915_READ64(BB_ADDR);
+                error->bbstate[ring->id] = I915_READ(RING_BBSTATE(ring->mmio_base));
         } else {
                 error->faddr[ring->id] = I915_READ(DMA_FADD_I8XX);
                 error->ipeir[ring->id] = I915_READ(IPEIR);
@@ -720,6 +745,9 @@ static void i915_record_ring_state(struct drm_device *dev,
 
         error->cpu_ring_head[ring->id] = ring->head;
         error->cpu_ring_tail[ring->id] = ring->tail;
+
+        error->hangcheck_score[ring->id] = ring->hangcheck.score;
+        error->hangcheck_action[ring->id] = ring->hangcheck.action;
 }
 
 
@@ -769,7 +797,7 @@ static void i915_gem_record_rings(struct drm_device *dev,
 
                 error->ring[i].num_requests = count;
                 error->ring[i].requests =
-                        kmalloc(count*sizeof(struct drm_i915_error_request),
+                        kcalloc(count, sizeof(*error->ring[i].requests),
                                 GFP_ATOMIC);
                 if (error->ring[i].requests == NULL) {
                         error->ring[i].num_requests = 0;
@@ -811,7 +839,7 @@ static void i915_gem_capture_vm(struct drm_i915_private *dev_priv,
         error->pinned_bo_count[ndx] = i - error->active_bo_count[ndx];
 
         if (i) {
-                active_bo = kmalloc(sizeof(*active_bo)*i, GFP_ATOMIC);
+                active_bo = kcalloc(i, sizeof(*active_bo), GFP_ATOMIC);
                 if (active_bo)
                         pinned_bo = active_bo + error->active_bo_count[ndx];
         }
@@ -885,8 +913,12 @@ void i915_capture_error_state(struct drm_device *dev)
                 return;
         }
 
-        DRM_INFO("capturing error event; look for more information in "
-                 "/sys/class/drm/card%d/error\n", dev->primary->index);
+        DRM_INFO("GPU crash dump saved to /sys/class/drm/card%d/error\n",
+                 dev->primary->index);
+        DRM_INFO("GPU hangs can indicate a bug anywhere in the entire gfx stack, including userspace.\n");
+        DRM_INFO("Please file a _new_ bug report on bugs.freedesktop.org against DRI -> DRM/Intel\n");
+        DRM_INFO("drm/i915 developers can then reassign to the right component if it's not a kernel issue.\n");
+        DRM_INFO("The gpu crash dump is required to analyze gpu hangs, so please always attach it.\n");
 
         kref_init(&error->ref);
         error->eir = I915_READ(EIR);
@@ -988,6 +1020,7 @@ const char *i915_cache_level_str(int type)
         case I915_CACHE_NONE: return " uncached";
         case I915_CACHE_LLC: return " snooped or LLC";
         case I915_CACHE_L3_LLC: return " L3+LLC";
+        case I915_CACHE_WT: return " WT";
         default: return "";
         }
 }
@@ -1012,6 +1045,7 @@ void i915_get_extra_instdone(struct drm_device *dev, uint32_t *instdone)
         default:
                 WARN_ONCE(1, "Unsupported platform\n");
         case 7:
+        case 8:
                 instdone[0] = I915_READ(GEN7_INSTDONE_1);
                 instdone[1] = I915_READ(GEN7_SC_INSTDONE);
                 instdone[2] = I915_READ(GEN7_SAMPLER_INSTDONE);