1 files changed, 97 insertions, 25 deletions

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 66cf41765bf9..eab41f9390f8 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -229,6 +229,8 @@ static const char *hangcheck_action_to_str(enum intel_ring_hangcheck_action a)
                 return "wait";
         case HANGCHECK_ACTIVE:
                 return "active";
+        case HANGCHECK_ACTIVE_LOOP:
+                return "active (loop)";
         case HANGCHECK_KICK:
                 return "kick";
         case HANGCHECK_HUNG:
@@ -327,6 +329,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
         struct drm_device *dev = error_priv->dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct drm_i915_error_state *error = error_priv->error;
+        struct drm_i915_error_object *obj;
         int i, j, offset, elt;
         int max_hangcheck_score;
 
@@ -358,6 +361,12 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
         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);
+        if (INTEL_INFO(dev)->gen >= 8) {
+                for (i = 0; i < 4; i++)
+                        err_printf(m, "GTIER gt %d: 0x%08x\n", i,
+                                   error->gtier[i]);
+        } else if (HAS_PCH_SPLIT(dev) || IS_VALLEYVIEW(dev))
+                err_printf(m, "GTIER: 0x%08x\n", error->gtier[0]);
         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);
@@ -395,8 +404,6 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
                                     error->pinned_bo_count[0]);
 
         for (i = 0; i < ARRAY_SIZE(error->ring); i++) {
-                struct drm_i915_error_object *obj;
-
                 obj = error->ring[i].batchbuffer;
                 if (obj) {
                         err_puts(m, dev_priv->ring[i].name);
@@ -459,6 +466,18 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
                 }
         }
 
+        if ((obj = error->semaphore_obj)) {
+                err_printf(m, "Semaphore page = 0x%08x\n", obj->gtt_offset);
+                for (elt = 0; elt < PAGE_SIZE/16; elt += 4) {
+                        err_printf(m, "[%04x] %08x %08x %08x %08x\n",
+                                   elt * 4,
+                                   obj->pages[0][elt],
+                                   obj->pages[0][elt+1],
+                                   obj->pages[0][elt+2],
+                                   obj->pages[0][elt+3]);
+                }
+        }
+
         if (error->overlay)
                 intel_overlay_print_error_state(m, error->overlay);
 
@@ -529,6 +548,7 @@ static void i915_error_state_free(struct kref *error_ref)
                 kfree(error->ring[i].requests);
         }
 
+        i915_error_object_free(error->semaphore_obj);
         kfree(error->active_bo);
         kfree(error->overlay);
         kfree(error->display);
@@ -746,7 +766,60 @@ static void i915_gem_record_fences(struct drm_device *dev,
         }
 }
 
+
+static void gen8_record_semaphore_state(struct drm_i915_private *dev_priv,
+                                        struct drm_i915_error_state *error,
+                                        struct intel_engine_cs *ring,
+                                        struct drm_i915_error_ring *ering)
+{
+        struct intel_engine_cs *to;
+        int i;
+
+        if (!i915_semaphore_is_enabled(dev_priv->dev))
+                return;
+
+        if (!error->semaphore_obj)
+                error->semaphore_obj =
+                        i915_error_object_create(dev_priv,
+                                                 dev_priv->semaphore_obj,
+                                                 &dev_priv->gtt.base);
+
+        for_each_ring(to, dev_priv, i) {
+                int idx;
+                u16 signal_offset;
+                u32 *tmp;
+
+                if (ring == to)
+                        continue;
+
+                signal_offset = (GEN8_SIGNAL_OFFSET(ring, i) & (PAGE_SIZE - 1))
+                                / 4;
+                tmp = error->semaphore_obj->pages[0];
+                idx = intel_ring_sync_index(ring, to);
+
+                ering->semaphore_mboxes[idx] = tmp[signal_offset];
+                ering->semaphore_seqno[idx] = ring->semaphore.sync_seqno[idx];
+        }
+}
+
+static void gen6_record_semaphore_state(struct drm_i915_private *dev_priv,
+                                        struct intel_engine_cs *ring,
+                                        struct drm_i915_error_ring *ering)
+{
+        ering->semaphore_mboxes[0] = I915_READ(RING_SYNC_0(ring->mmio_base));
+        ering->semaphore_mboxes[1] = I915_READ(RING_SYNC_1(ring->mmio_base));
+        ering->semaphore_seqno[0] = ring->semaphore.sync_seqno[0];
+        ering->semaphore_seqno[1] = ring->semaphore.sync_seqno[1];
+
+        if (HAS_VEBOX(dev_priv->dev)) {
+                ering->semaphore_mboxes[2] =
+                        I915_READ(RING_SYNC_2(ring->mmio_base));
+                ering->semaphore_seqno[2] = ring->semaphore.sync_seqno[2];
+        }
+}
+
 static void i915_record_ring_state(struct drm_device *dev,
+                                   struct drm_i915_error_state *error,
                                    struct intel_engine_cs *ring,
                                    struct drm_i915_error_ring *ering)
 {
@@ -755,18 +828,10 @@ static void i915_record_ring_state(struct drm_device *dev,
         if (INTEL_INFO(dev)->gen >= 6) {
                 ering->rc_psmi = I915_READ(ring->mmio_base + 0x50);
                 ering->fault_reg = I915_READ(RING_FAULT_REG(ring));
-                ering->semaphore_mboxes[0]
-                        = I915_READ(RING_SYNC_0(ring->mmio_base));
-                ering->semaphore_mboxes[1]
-                        = I915_READ(RING_SYNC_1(ring->mmio_base));
-                ering->semaphore_seqno[0] = ring->semaphore.sync_seqno[0];
-                ering->semaphore_seqno[1] = ring->semaphore.sync_seqno[1];
-        }
-
-        if (HAS_VEBOX(dev)) {
-                ering->semaphore_mboxes[2] =
-                        I915_READ(RING_SYNC_2(ring->mmio_base));
-                ering->semaphore_seqno[2] = ring->semaphore.sync_seqno[2];
+                if (INTEL_INFO(dev)->gen >= 8)
+                        gen8_record_semaphore_state(dev_priv, error, ring, ering);
+                else
+                        gen6_record_semaphore_state(dev_priv, ring, ering);
         }
 
         if (INTEL_INFO(dev)->gen >= 4) {
@@ -871,6 +936,9 @@ static void i915_gem_record_active_context(struct intel_engine_cs *ring,
                 return;
 
         list_for_each_entry(obj, &dev_priv->mm.bound_list, global_list) {
+                if (!i915_gem_obj_ggtt_bound(obj))
+                        continue;
+
                 if ((error->ccid & PAGE_MASK) == i915_gem_obj_ggtt_offset(obj)) {
                         ering->ctx = i915_error_ggtt_object_create(dev_priv, obj);
                         break;
@@ -895,7 +963,7 @@ static void i915_gem_record_rings(struct drm_device *dev,
 
                 error->ring[i].valid = true;
 
-                i915_record_ring_state(dev, ring, &error->ring[i]);
+                i915_record_ring_state(dev, error, ring, &error->ring[i]);
 
                 request = i915_gem_find_active_request(ring);
                 if (request) {
@@ -1032,6 +1100,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,
                                    struct drm_i915_error_state *error)
 {
         struct drm_device *dev = dev_priv->dev;
+        int i;
 
         /* General organization
          * 1. Registers specific to a single generation
@@ -1043,7 +1112,8 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,
 
         /* 1: Registers specific to a single generation */
         if (IS_VALLEYVIEW(dev)) {
-                error->ier = I915_READ(GTIER) | I915_READ(VLV_IER);
+                error->gtier[0] = I915_READ(GTIER);
+                error->ier = I915_READ(VLV_IER);
                 error->forcewake = I915_READ(FORCEWAKE_VLV);
         }
 
@@ -1076,16 +1146,18 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,
         if (HAS_HW_CONTEXTS(dev))
                 error->ccid = I915_READ(CCID);
 
-        if (HAS_PCH_SPLIT(dev))
-                error->ier = I915_READ(DEIER) | I915_READ(GTIER);
-        else {
-                if (IS_GEN2(dev))
-                        error->ier = I915_READ16(IER);
-                else
-                        error->ier = I915_READ(IER);
+        if (INTEL_INFO(dev)->gen >= 8) {
+                error->ier = I915_READ(GEN8_DE_MISC_IER);
+                for (i = 0; i < 4; i++)
+                        error->gtier[i] = I915_READ(GEN8_GT_IER(i));
+        } else if (HAS_PCH_SPLIT(dev)) {
+                error->ier = I915_READ(DEIER);
+                error->gtier[0] = I915_READ(GTIER);
+        } else if (IS_GEN2(dev)) {
+                error->ier = I915_READ16(IER);
+        } else if (!IS_VALLEYVIEW(dev)) {
+                error->ier = I915_READ(IER);
         }
-
-        /* 4: Everything else */
         error->eir = I915_READ(EIR);
         error->pgtbl_er = I915_READ(PGTBL_ER);