]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - drivers/gpu/drm/i915/i915_gpu_error.c
drm/i915: Avoid accessing request->timeline outside of its lifetime
[karo-tx-linux.git] / drivers / gpu / drm / i915 / i915_gpu_error.c
index 9d73d2216adc6925f09b97f76a71690daf213374..204093f3eaa5234f610636480cdbf8ec9922f5c3 100644 (file)
  */
 
 #include <generated/utsrelease.h>
+#include <linux/stop_machine.h>
+#include <linux/zlib.h>
 #include "i915_drv.h"
 
-static const char *ring_str(int ring)
+static const char *engine_str(int engine)
 {
-       switch (ring) {
+       switch (engine) {
        case RCS: return "render";
        case VCS: return "bsd";
        case BCS: return "blt";
@@ -42,16 +44,6 @@ static const char *ring_str(int ring)
        }
 }
 
-static const char *pin_flag(int pinned)
-{
-       if (pinned > 0)
-               return " P";
-       else if (pinned < 0)
-               return " p";
-       else
-               return "";
-}
-
 static const char *tiling_flag(int tiling)
 {
        switch (tiling) {
@@ -182,6 +174,110 @@ static void i915_error_puts(struct drm_i915_error_state_buf *e,
 #define err_printf(e, ...) i915_error_printf(e, __VA_ARGS__)
 #define err_puts(e, s) i915_error_puts(e, s)
 
+#ifdef CONFIG_DRM_I915_COMPRESS_ERROR
+
+static bool compress_init(struct z_stream_s *zstream)
+{
+       memset(zstream, 0, sizeof(*zstream));
+
+       zstream->workspace =
+               kmalloc(zlib_deflate_workspacesize(MAX_WBITS, MAX_MEM_LEVEL),
+                       GFP_ATOMIC | __GFP_NOWARN);
+       if (!zstream->workspace)
+               return false;
+
+       if (zlib_deflateInit(zstream, Z_DEFAULT_COMPRESSION) != Z_OK) {
+               kfree(zstream->workspace);
+               return false;
+       }
+
+       return true;
+}
+
+static int compress_page(struct z_stream_s *zstream,
+                        void *src,
+                        struct drm_i915_error_object *dst)
+{
+       zstream->next_in = src;
+       zstream->avail_in = PAGE_SIZE;
+
+       do {
+               if (zstream->avail_out == 0) {
+                       unsigned long page;
+
+                       page = __get_free_page(GFP_ATOMIC | __GFP_NOWARN);
+                       if (!page)
+                               return -ENOMEM;
+
+                       dst->pages[dst->page_count++] = (void *)page;
+
+                       zstream->next_out = (void *)page;
+                       zstream->avail_out = PAGE_SIZE;
+               }
+
+               if (zlib_deflate(zstream, Z_SYNC_FLUSH) != Z_OK)
+                       return -EIO;
+       } while (zstream->avail_in);
+
+       /* Fallback to uncompressed if we increase size? */
+       if (0 && zstream->total_out > zstream->total_in)
+               return -E2BIG;
+
+       return 0;
+}
+
+static void compress_fini(struct z_stream_s *zstream,
+                         struct drm_i915_error_object *dst)
+{
+       if (dst) {
+               zlib_deflate(zstream, Z_FINISH);
+               dst->unused = zstream->avail_out;
+       }
+
+       zlib_deflateEnd(zstream);
+       kfree(zstream->workspace);
+}
+
+static void err_compression_marker(struct drm_i915_error_state_buf *m)
+{
+       err_puts(m, ":");
+}
+
+#else
+
+static bool compress_init(struct z_stream_s *zstream)
+{
+       return true;
+}
+
+static int compress_page(struct z_stream_s *zstream,
+                        void *src,
+                        struct drm_i915_error_object *dst)
+{
+       unsigned long page;
+
+       page = __get_free_page(GFP_ATOMIC | __GFP_NOWARN);
+       if (!page)
+               return -ENOMEM;
+
+       dst->pages[dst->page_count++] =
+               memcpy((void *)page, src, PAGE_SIZE);
+
+       return 0;
+}
+
+static void compress_fini(struct z_stream_s *zstream,
+                         struct drm_i915_error_object *dst)
+{
+}
+
+static void err_compression_marker(struct drm_i915_error_state_buf *m)
+{
+       err_puts(m, "~");
+}
+
+#endif
+
 static void print_error_buffers(struct drm_i915_error_state_buf *m,
                                const char *name,
                                struct drm_i915_error_buffer *err,
@@ -189,7 +285,7 @@ static void print_error_buffers(struct drm_i915_error_state_buf *m,
 {
        int i;
 
-       err_printf(m, "  %s [%d]:\n", name, count);
+       err_printf(m, "%s [%d]:\n", name, count);
 
        while (count--) {
                err_printf(m, "    %08x_%08x %8u %02x %02x [ ",
@@ -202,13 +298,12 @@ static void print_error_buffers(struct drm_i915_error_state_buf *m,
                        err_printf(m, "%02x ", err->rseqno[i]);
 
                err_printf(m, "] %02x", err->wseqno);
-               err_puts(m, pin_flag(err->pinned));
                err_puts(m, tiling_flag(err->tiling));
                err_puts(m, dirty_flag(err->dirty));
                err_puts(m, purgeable_flag(err->purgeable));
                err_puts(m, err->userptr ? " userptr" : "");
-               err_puts(m, err->ring != -1 ? " " : "");
-               err_puts(m, ring_str(err->ring));
+               err_puts(m, err->engine != -1 ? " " : "");
+               err_puts(m, engine_str(err->engine));
                err_puts(m, i915_cache_level_str(m->i915, err->cache_level));
 
                if (err->name)
@@ -221,7 +316,7 @@ 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)
+static const char *hangcheck_action_to_str(enum intel_engine_hangcheck_action a)
 {
        switch (a) {
        case HANGCHECK_IDLE:
@@ -239,70 +334,118 @@ static const char *hangcheck_action_to_str(enum intel_ring_hangcheck_action a)
        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,
-                                 int ring_idx)
+static void error_print_instdone(struct drm_i915_error_state_buf *m,
+                                struct drm_i915_error_engine *ee)
 {
-       struct drm_i915_error_ring *ring = &error->ring[ring_idx];
+       int slice;
+       int subslice;
+
+       err_printf(m, "  INSTDONE: 0x%08x\n",
+                  ee->instdone.instdone);
 
-       if (!ring->valid)
+       if (ee->engine_id != RCS || INTEL_GEN(m->i915) <= 3)
                return;
 
-       err_printf(m, "%s command stream:\n", ring_str(ring_idx));
-       err_printf(m, "  START: 0x%08x\n", ring->start);
-       err_printf(m, "  HEAD:  0x%08x\n", ring->head);
-       err_printf(m, "  TAIL:  0x%08x\n", ring->tail);
-       err_printf(m, "  CTL:   0x%08x\n", ring->ctl);
-       err_printf(m, "  HWS:   0x%08x\n", ring->hws);
-       err_printf(m, "  ACTHD: 0x%08x %08x\n", (u32)(ring->acthd>>32), (u32)ring->acthd);
-       err_printf(m, "  IPEIR: 0x%08x\n", ring->ipeir);
-       err_printf(m, "  IPEHR: 0x%08x\n", ring->ipehr);
-       err_printf(m, "  INSTDONE: 0x%08x\n", ring->instdone);
-       if (INTEL_INFO(dev)->gen >= 4) {
-               err_printf(m, "  BBADDR: 0x%08x %08x\n", (u32)(ring->bbaddr>>32), (u32)ring->bbaddr);
-               err_printf(m, "  BB_STATE: 0x%08x\n", ring->bbstate);
-               err_printf(m, "  INSTPS: 0x%08x\n", ring->instps);
+       err_printf(m, "  SC_INSTDONE: 0x%08x\n",
+                  ee->instdone.slice_common);
+
+       if (INTEL_GEN(m->i915) <= 6)
+               return;
+
+       for_each_instdone_slice_subslice(m->i915, slice, subslice)
+               err_printf(m, "  SAMPLER_INSTDONE[%d][%d]: 0x%08x\n",
+                          slice, subslice,
+                          ee->instdone.sampler[slice][subslice]);
+
+       for_each_instdone_slice_subslice(m->i915, slice, subslice)
+               err_printf(m, "  ROW_INSTDONE[%d][%d]: 0x%08x\n",
+                          slice, subslice,
+                          ee->instdone.row[slice][subslice]);
+}
+
+static void error_print_request(struct drm_i915_error_state_buf *m,
+                               const char *prefix,
+                               struct drm_i915_error_request *erq)
+{
+       if (!erq->seqno)
+               return;
+
+       err_printf(m, "%s pid %d, seqno %8x:%08x, emitted %dms ago, head %08x, tail %08x\n",
+                  prefix, erq->pid,
+                  erq->context, erq->seqno,
+                  jiffies_to_msecs(jiffies - erq->jiffies),
+                  erq->head, erq->tail);
+}
+
+static void error_print_engine(struct drm_i915_error_state_buf *m,
+                              struct drm_i915_error_engine *ee)
+{
+       err_printf(m, "%s command stream:\n", engine_str(ee->engine_id));
+       err_printf(m, "  START: 0x%08x\n", ee->start);
+       err_printf(m, "  HEAD:  0x%08x [0x%08x]\n", ee->head, ee->rq_head);
+       err_printf(m, "  TAIL:  0x%08x [0x%08x, 0x%08x]\n",
+                  ee->tail, ee->rq_post, ee->rq_tail);
+       err_printf(m, "  CTL:   0x%08x\n", ee->ctl);
+       err_printf(m, "  MODE:  0x%08x\n", ee->mode);
+       err_printf(m, "  HWS:   0x%08x\n", ee->hws);
+       err_printf(m, "  ACTHD: 0x%08x %08x\n",
+                  (u32)(ee->acthd>>32), (u32)ee->acthd);
+       err_printf(m, "  IPEIR: 0x%08x\n", ee->ipeir);
+       err_printf(m, "  IPEHR: 0x%08x\n", ee->ipehr);
+
+       error_print_instdone(m, ee);
+
+       if (ee->batchbuffer) {
+               u64 start = ee->batchbuffer->gtt_offset;
+               u64 end = start + ee->batchbuffer->gtt_size;
+
+               err_printf(m, "  batch: [0x%08x_%08x, 0x%08x_%08x]\n",
+                          upper_32_bits(start), lower_32_bits(start),
+                          upper_32_bits(end), lower_32_bits(end));
        }
-       err_printf(m, "  INSTPM: 0x%08x\n", ring->instpm);
-       err_printf(m, "  FADDR: 0x%08x %08x\n", upper_32_bits(ring->faddr),
-                  lower_32_bits(ring->faddr));
-       if (INTEL_INFO(dev)->gen >= 6) {
-               err_printf(m, "  RC PSMI: 0x%08x\n", ring->rc_psmi);
-               err_printf(m, "  FAULT_REG: 0x%08x\n", ring->fault_reg);
-               err_printf(m, "  SYNC_0: 0x%08x [last synced 0x%08x]\n",
-                          ring->semaphore_mboxes[0],
-                          ring->semaphore_seqno[0]);
-               err_printf(m, "  SYNC_1: 0x%08x [last synced 0x%08x]\n",
-                          ring->semaphore_mboxes[1],
-                          ring->semaphore_seqno[1]);
-               if (HAS_VEBOX(dev)) {
-                       err_printf(m, "  SYNC_2: 0x%08x [last synced 0x%08x]\n",
-                                  ring->semaphore_mboxes[2],
-                                  ring->semaphore_seqno[2]);
-               }
+       if (INTEL_GEN(m->i915) >= 4) {
+               err_printf(m, "  BBADDR: 0x%08x_%08x\n",
+                          (u32)(ee->bbaddr>>32), (u32)ee->bbaddr);
+               err_printf(m, "  BB_STATE: 0x%08x\n", ee->bbstate);
+               err_printf(m, "  INSTPS: 0x%08x\n", ee->instps);
        }
-       if (USES_PPGTT(dev)) {
-               err_printf(m, "  GFX_MODE: 0x%08x\n", ring->vm_info.gfx_mode);
+       err_printf(m, "  INSTPM: 0x%08x\n", ee->instpm);
+       err_printf(m, "  FADDR: 0x%08x %08x\n", upper_32_bits(ee->faddr),
+                  lower_32_bits(ee->faddr));
+       if (INTEL_GEN(m->i915) >= 6) {
+               err_printf(m, "  RC PSMI: 0x%08x\n", ee->rc_psmi);
+               err_printf(m, "  FAULT_REG: 0x%08x\n", ee->fault_reg);
+               err_printf(m, "  SYNC_0: 0x%08x\n",
+                          ee->semaphore_mboxes[0]);
+               err_printf(m, "  SYNC_1: 0x%08x\n",
+                          ee->semaphore_mboxes[1]);
+               if (HAS_VEBOX(m->i915))
+                       err_printf(m, "  SYNC_2: 0x%08x\n",
+                                  ee->semaphore_mboxes[2]);
+       }
+       if (USES_PPGTT(m->i915)) {
+               err_printf(m, "  GFX_MODE: 0x%08x\n", ee->vm_info.gfx_mode);
 
-               if (INTEL_INFO(dev)->gen >= 8) {
+               if (INTEL_GEN(m->i915) >= 8) {
                        int i;
                        for (i = 0; i < 4; i++)
                                err_printf(m, "  PDP%d: 0x%016llx\n",
-                                          i, ring->vm_info.pdp[i]);
+                                          i, ee->vm_info.pdp[i]);
                } else {
                        err_printf(m, "  PP_DIR_BASE: 0x%08x\n",
-                                  ring->vm_info.pp_dir_base);
+                                  ee->vm_info.pp_dir_base);
                }
        }
-       err_printf(m, "  seqno: 0x%08x\n", ring->seqno);
-       err_printf(m, "  last_seqno: 0x%08x\n", ring->last_seqno);
-       err_printf(m, "  waiting: %s\n", yesno(ring->waiting));
-       err_printf(m, "  ring->head: 0x%08x\n", ring->cpu_ring_head);
-       err_printf(m, "  ring->tail: 0x%08x\n", ring->cpu_ring_tail);
+       err_printf(m, "  seqno: 0x%08x\n", ee->seqno);
+       err_printf(m, "  last_seqno: 0x%08x\n", ee->last_seqno);
+       err_printf(m, "  waiting: %s\n", yesno(ee->waiting));
+       err_printf(m, "  ring->head: 0x%08x\n", ee->cpu_ring_head);
+       err_printf(m, "  ring->tail: 0x%08x\n", ee->cpu_ring_tail);
        err_printf(m, "  hangcheck: %s [%d]\n",
-                  hangcheck_action_to_str(ring->hangcheck_action),
-                  ring->hangcheck_score);
+                  hangcheck_action_to_str(ee->hangcheck_action),
+                  ee->hangcheck_score);
+       error_print_request(m, "  ELSP[0]: ", &ee->execlist[0]);
+       error_print_request(m, "  ELSP[1]: ", &ee->execlist[1]);
 }
 
 void i915_error_printf(struct drm_i915_error_state_buf *e, const char *f, ...)
@@ -314,18 +457,72 @@ void i915_error_printf(struct drm_i915_error_state_buf *e, const char *f, ...)
        va_end(args);
 }
 
+static int
+ascii85_encode_len(int len)
+{
+       return DIV_ROUND_UP(len, 4);
+}
+
+static bool
+ascii85_encode(u32 in, char *out)
+{
+       int i;
+
+       if (in == 0)
+               return false;
+
+       out[5] = '\0';
+       for (i = 5; i--; ) {
+               out[i] = '!' + in % 85;
+               in /= 85;
+       }
+
+       return true;
+}
+
 static void print_error_obj(struct drm_i915_error_state_buf *m,
+                           struct intel_engine_cs *engine,
+                           const char *name,
                            struct drm_i915_error_object *obj)
 {
-       int page, offset, elt;
+       char out[6];
+       int page;
+
+       if (!obj)
+               return;
+
+       if (name) {
+               err_printf(m, "%s --- %s = 0x%08x %08x\n",
+                          engine ? engine->name : "global", name,
+                          upper_32_bits(obj->gtt_offset),
+                          lower_32_bits(obj->gtt_offset));
+       }
+
+       err_compression_marker(m);
+       for (page = 0; page < obj->page_count; page++) {
+               int i, len;
 
-       for (page = offset = 0; page < obj->page_count; page++) {
-               for (elt = 0; elt < PAGE_SIZE/4; elt++) {
-                       err_printf(m, "%08x :  %08x\n", offset,
-                                  obj->pages[page][elt]);
-                       offset += 4;
+               len = PAGE_SIZE;
+               if (page == obj->page_count - 1)
+                       len -= obj->unused;
+               len = ascii85_encode_len(len);
+
+               for (i = 0; i < len; i++) {
+                       if (ascii85_encode(obj->pages[page][i], out))
+                               err_puts(m, out);
+                       else
+                               err_puts(m, "z");
                }
        }
+       err_puts(m, "\n");
+}
+
+static void err_print_capabilities(struct drm_i915_error_state_buf *m,
+                                  const struct intel_device_info *info)
+{
+#define PRINT_FLAG(x)  err_printf(m, #x ": %s\n", yesno(info->x))
+       DEV_INFO_FOR_EACH_FLAG(PRINT_FLAG);
+#undef PRINT_FLAG
 }
 
 int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
@@ -333,10 +530,11 @@ 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 = to_i915(dev);
+       struct pci_dev *pdev = dev_priv->drm.pdev;
        struct drm_i915_error_state *error = error_priv->error;
        struct drm_i915_error_object *obj;
-       int i, j, offset, elt;
        int max_hangcheck_score;
+       int i, j;
 
        if (!error) {
                err_printf(m, "no error state collected\n");
@@ -344,30 +542,35 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
        }
 
        err_printf(m, "%s\n", error->error_msg);
-       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, "Time: %ld s %ld us\n",
+                  error->time.tv_sec, error->time.tv_usec);
+       err_printf(m, "Boottime: %ld s %ld us\n",
+                  error->boottime.tv_sec, error->boottime.tv_usec);
+       err_printf(m, "Uptime: %ld s %ld us\n",
+                  error->uptime.tv_sec, error->uptime.tv_usec);
+       err_print_capabilities(m, &error->device_info);
        max_hangcheck_score = 0;
-       for (i = 0; i < ARRAY_SIZE(error->ring); i++) {
-               if (error->ring[i].hangcheck_score > max_hangcheck_score)
-                       max_hangcheck_score = error->ring[i].hangcheck_score;
+       for (i = 0; i < ARRAY_SIZE(error->engine); i++) {
+               if (error->engine[i].hangcheck_score > max_hangcheck_score)
+                       max_hangcheck_score = error->engine[i].hangcheck_score;
        }
-       for (i = 0; i < ARRAY_SIZE(error->ring); i++) {
-               if (error->ring[i].hangcheck_score == max_hangcheck_score &&
-                   error->ring[i].pid != -1) {
+       for (i = 0; i < ARRAY_SIZE(error->engine); i++) {
+               if (error->engine[i].hangcheck_score == max_hangcheck_score &&
+                   error->engine[i].pid != -1) {
                        err_printf(m, "Active process (on ring %s): %s [%d]\n",
-                                  ring_str(i),
-                                  error->ring[i].comm,
-                                  error->ring[i].pid);
+                                  engine_str(i),
+                                  error->engine[i].comm,
+                                  error->engine[i].pid);
                }
        }
        err_printf(m, "Reset count: %u\n", error->reset_count);
        err_printf(m, "Suspend count: %u\n", error->suspend_count);
-       err_printf(m, "PCI ID: 0x%04x\n", dev->pdev->device);
-       err_printf(m, "PCI Revision: 0x%02x\n", dev->pdev->revision);
+       err_printf(m, "PCI ID: 0x%04x\n", pdev->device);
+       err_printf(m, "PCI Revision: 0x%02x\n", pdev->revision);
        err_printf(m, "PCI Subsystem: %04x:%04x\n",
-                  dev->pdev->subsystem_vendor,
-                  dev->pdev->subsystem_device);
+                  pdev->subsystem_vendor,
+                  pdev->subsystem_device);
        err_printf(m, "IOMMU enabled?: %d\n", error->iommu);
 
        if (HAS_CSR(dev)) {
@@ -386,7 +589,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
                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))
+       } else if (HAS_PCH_SPLIT(dev_priv) || IS_VALLEYVIEW(dev_priv))
                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);
@@ -397,10 +600,6 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
        for (i = 0; i < dev_priv->num_fence_regs; i++)
                err_printf(m, "  fence[%d] = %08llx\n", i, error->fence[i]);
 
-       for (i = 0; i < ARRAY_SIZE(error->extra_instdone); i++)
-               err_printf(m, "  INSTDONE_%d: 0x%08x\n", i,
-                          error->extra_instdone[i]);
-
        if (INTEL_INFO(dev)->gen >= 6) {
                err_printf(m, "ERROR: 0x%08x\n", error->error);
 
@@ -411,141 +610,99 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
                err_printf(m, "DONE_REG: 0x%08x\n", error->done_reg);
        }
 
-       if (IS_GEN7(dev))
+       if (IS_GEN7(dev_priv))
                err_printf(m, "ERR_INT: 0x%08x\n", error->err_int);
 
-       for (i = 0; i < ARRAY_SIZE(error->ring); i++)
-               i915_ring_error_state(m, dev, error, i);
+       for (i = 0; i < ARRAY_SIZE(error->engine); i++) {
+               if (error->engine[i].engine_id != -1)
+                       error_print_engine(m, &error->engine[i]);
+       }
+
+       for (i = 0; i < ARRAY_SIZE(error->active_vm); i++) {
+               char buf[128];
+               int len, first = 1;
+
+               if (!error->active_vm[i])
+                       break;
 
-       for (i = 0; i < error->vm_count; i++) {
-               err_printf(m, "vm[%d]\n", i);
+               len = scnprintf(buf, sizeof(buf), "Active (");
+               for (j = 0; j < ARRAY_SIZE(error->engine); j++) {
+                       if (error->engine[j].vm != error->active_vm[i])
+                               continue;
 
-               print_error_buffers(m, "Active",
+                       len += scnprintf(buf + len, sizeof(buf), "%s%s",
+                                        first ? "" : ", ",
+                                        dev_priv->engine[j]->name);
+                       first = 0;
+               }
+               scnprintf(buf + len, sizeof(buf), ")");
+               print_error_buffers(m, buf,
                                    error->active_bo[i],
                                    error->active_bo_count[i]);
-
-               print_error_buffers(m, "Pinned",
-                                   error->pinned_bo[i],
-                                   error->pinned_bo_count[i]);
        }
 
-       for (i = 0; i < ARRAY_SIZE(error->ring); i++) {
-               obj = error->ring[i].batchbuffer;
+       print_error_buffers(m, "Pinned (global)",
+                           error->pinned_bo,
+                           error->pinned_bo_count);
+
+       for (i = 0; i < ARRAY_SIZE(error->engine); i++) {
+               struct drm_i915_error_engine *ee = &error->engine[i];
+
+               obj = ee->batchbuffer;
                if (obj) {
-                       err_puts(m, dev_priv->engine[i].name);
-                       if (error->ring[i].pid != -1)
+                       err_puts(m, dev_priv->engine[i]->name);
+                       if (ee->pid != -1)
                                err_printf(m, " (submitted by %s [%d])",
-                                          error->ring[i].comm,
-                                          error->ring[i].pid);
+                                          ee->comm,
+                                          ee->pid);
                        err_printf(m, " --- gtt_offset = 0x%08x %08x\n",
                                   upper_32_bits(obj->gtt_offset),
                                   lower_32_bits(obj->gtt_offset));
-                       print_error_obj(m, obj);
+                       print_error_obj(m, dev_priv->engine[i], NULL, obj);
                }
 
-               obj = error->ring[i].wa_batchbuffer;
-               if (obj) {
-                       err_printf(m, "%s (w/a) --- gtt_offset = 0x%08x\n",
-                                  dev_priv->engine[i].name,
-                                  lower_32_bits(obj->gtt_offset));
-                       print_error_obj(m, obj);
-               }
-
-               if (error->ring[i].num_requests) {
+               if (ee->num_requests) {
                        err_printf(m, "%s --- %d requests\n",
-                                  dev_priv->engine[i].name,
-                                  error->ring[i].num_requests);
-                       for (j = 0; j < error->ring[i].num_requests; j++) {
-                               err_printf(m, "  seqno 0x%08x, emitted %ld, tail 0x%08x\n",
-                                          error->ring[i].requests[j].seqno,
-                                          error->ring[i].requests[j].jiffies,
-                                          error->ring[i].requests[j].tail);
-                       }
+                                  dev_priv->engine[i]->name,
+                                  ee->num_requests);
+                       for (j = 0; j < ee->num_requests; j++)
+                               error_print_request(m, " ", &ee->requests[j]);
                }
 
-               if (error->ring[i].num_waiters) {
+               if (IS_ERR(ee->waiters)) {
+                       err_printf(m, "%s --- ? waiters [unable to acquire spinlock]\n",
+                                  dev_priv->engine[i]->name);
+               } else if (ee->num_waiters) {
                        err_printf(m, "%s --- %d waiters\n",
-                                  dev_priv->engine[i].name,
-                                  error->ring[i].num_waiters);
-                       for (j = 0; j < error->ring[i].num_waiters; j++) {
+                                  dev_priv->engine[i]->name,
+                                  ee->num_waiters);
+                       for (j = 0; j < ee->num_waiters; j++) {
                                err_printf(m, " seqno 0x%08x for %s [%d]\n",
-                                          error->ring[i].waiters[j].seqno,
-                                          error->ring[i].waiters[j].comm,
-                                          error->ring[i].waiters[j].pid);
+                                          ee->waiters[j].seqno,
+                                          ee->waiters[j].comm,
+                                          ee->waiters[j].pid);
                        }
                }
 
-               if ((obj = error->ring[i].ringbuffer)) {
-                       err_printf(m, "%s --- ringbuffer = 0x%08x\n",
-                                  dev_priv->engine[i].name,
-                                  lower_32_bits(obj->gtt_offset));
-                       print_error_obj(m, obj);
-               }
+               print_error_obj(m, dev_priv->engine[i],
+                               "ringbuffer", ee->ringbuffer);
 
-               if ((obj = error->ring[i].hws_page)) {
-                       u64 hws_offset = obj->gtt_offset;
-                       u32 *hws_page = &obj->pages[0][0];
+               print_error_obj(m, dev_priv->engine[i],
+                               "HW Status", ee->hws_page);
 
-                       if (i915.enable_execlists) {
-                               hws_offset += LRC_PPHWSP_PN * PAGE_SIZE;
-                               hws_page = &obj->pages[LRC_PPHWSP_PN][0];
-                       }
-                       err_printf(m, "%s --- HW Status = 0x%08llx\n",
-                                  dev_priv->engine[i].name, hws_offset);
-                       offset = 0;
-                       for (elt = 0; elt < PAGE_SIZE/16; elt += 4) {
-                               err_printf(m, "[%04x] %08x %08x %08x %08x\n",
-                                          offset,
-                                          hws_page[elt],
-                                          hws_page[elt+1],
-                                          hws_page[elt+2],
-                                          hws_page[elt+3]);
-                               offset += 16;
-                       }
-               }
+               print_error_obj(m, dev_priv->engine[i],
+                               "HW context", ee->ctx);
 
-               obj = error->ring[i].wa_ctx;
-               if (obj) {
-                       u64 wa_ctx_offset = obj->gtt_offset;
-                       u32 *wa_ctx_page = &obj->pages[0][0];
-                       struct intel_engine_cs *engine = &dev_priv->engine[RCS];
-                       u32 wa_ctx_size = (engine->wa_ctx.indirect_ctx.size +
-                                          engine->wa_ctx.per_ctx.size);
-
-                       err_printf(m, "%s --- WA ctx batch buffer = 0x%08llx\n",
-                                  dev_priv->engine[i].name, wa_ctx_offset);
-                       offset = 0;
-                       for (elt = 0; elt < wa_ctx_size; elt += 4) {
-                               err_printf(m, "[%04x] %08x %08x %08x %08x\n",
-                                          offset,
-                                          wa_ctx_page[elt + 0],
-                                          wa_ctx_page[elt + 1],
-                                          wa_ctx_page[elt + 2],
-                                          wa_ctx_page[elt + 3]);
-                               offset += 16;
-                       }
-               }
+               print_error_obj(m, dev_priv->engine[i],
+                               "WA context", ee->wa_ctx);
 
-               if ((obj = error->ring[i].ctx)) {
-                       err_printf(m, "%s --- HW Context = 0x%08x\n",
-                                  dev_priv->engine[i].name,
-                                  lower_32_bits(obj->gtt_offset));
-                       print_error_obj(m, obj);
-               }
+               print_error_obj(m, dev_priv->engine[i],
+                               "WA batchbuffer", ee->wa_batchbuffer);
        }
 
-       if ((obj = error->semaphore_obj)) {
-               err_printf(m, "Semaphore page = 0x%08x\n",
-                          lower_32_bits(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]);
-               }
-       }
+       print_error_obj(m, NULL, "Semaphores", error->semaphore);
+
+       print_error_obj(m, NULL, "GuC log buffer", error->guc_log);
 
        if (error->overlay)
                intel_overlay_print_error_state(m, error->overlay);
@@ -600,7 +757,7 @@ static void i915_error_object_free(struct drm_i915_error_object *obj)
                return;
 
        for (page = 0; page < obj->page_count; page++)
-               kfree(obj->pages[page]);
+               free_page((unsigned long)obj->pages[page]);
 
        kfree(obj);
 }
@@ -611,134 +768,110 @@ static void i915_error_state_free(struct kref *error_ref)
                                                          typeof(*error), ref);
        int i;
 
-       for (i = 0; i < ARRAY_SIZE(error->ring); i++) {
-               i915_error_object_free(error->ring[i].batchbuffer);
-               i915_error_object_free(error->ring[i].wa_batchbuffer);
-               i915_error_object_free(error->ring[i].ringbuffer);
-               i915_error_object_free(error->ring[i].hws_page);
-               i915_error_object_free(error->ring[i].ctx);
-               i915_error_object_free(error->ring[i].wa_ctx);
-               kfree(error->ring[i].requests);
-               kfree(error->ring[i].waiters);
+       for (i = 0; i < ARRAY_SIZE(error->engine); i++) {
+               struct drm_i915_error_engine *ee = &error->engine[i];
+
+               i915_error_object_free(ee->batchbuffer);
+               i915_error_object_free(ee->wa_batchbuffer);
+               i915_error_object_free(ee->ringbuffer);
+               i915_error_object_free(ee->hws_page);
+               i915_error_object_free(ee->ctx);
+               i915_error_object_free(ee->wa_ctx);
+
+               kfree(ee->requests);
+               if (!IS_ERR_OR_NULL(ee->waiters))
+                       kfree(ee->waiters);
        }
 
-       i915_error_object_free(error->semaphore_obj);
+       i915_error_object_free(error->semaphore);
+       i915_error_object_free(error->guc_log);
 
-       for (i = 0; i < error->vm_count; i++)
+       for (i = 0; i < ARRAY_SIZE(error->active_bo); i++)
                kfree(error->active_bo[i]);
-
-       kfree(error->active_bo);
-       kfree(error->active_bo_count);
        kfree(error->pinned_bo);
-       kfree(error->pinned_bo_count);
+
        kfree(error->overlay);
        kfree(error->display);
        kfree(error);
 }
 
 static struct drm_i915_error_object *
-i915_error_object_create(struct drm_i915_private *dev_priv,
-                        struct drm_i915_gem_object *src,
-                        struct i915_address_space *vm)
+i915_error_object_create(struct drm_i915_private *i915,
+                        struct i915_vma *vma)
 {
-       struct i915_ggtt *ggtt = &dev_priv->ggtt;
+       struct i915_ggtt *ggtt = &i915->ggtt;
+       const u64 slot = ggtt->error_capture.start;
        struct drm_i915_error_object *dst;
-       struct i915_vma *vma = NULL;
-       int num_pages;
-       bool use_ggtt;
-       int i = 0;
-       u64 reloc_offset;
+       struct z_stream_s zstream;
+       unsigned long num_pages;
+       struct sgt_iter iter;
+       dma_addr_t dma;
 
-       if (src == NULL || src->pages == NULL)
+       if (!vma)
                return NULL;
 
-       num_pages = src->base.size >> PAGE_SHIFT;
-
-       dst = kmalloc(sizeof(*dst) + num_pages * sizeof(u32 *), GFP_ATOMIC);
-       if (dst == NULL)
+       num_pages = min_t(u64, vma->size, vma->obj->base.size) >> PAGE_SHIFT;
+       num_pages = DIV_ROUND_UP(10 * num_pages, 8); /* worstcase zlib growth */
+       dst = kmalloc(sizeof(*dst) + num_pages * sizeof(u32 *),
+                     GFP_ATOMIC | __GFP_NOWARN);
+       if (!dst)
                return NULL;
 
-       if (i915_gem_obj_bound(src, vm))
-               dst->gtt_offset = i915_gem_obj_offset(src, vm);
-       else
-               dst->gtt_offset = -1;
-
-       reloc_offset = dst->gtt_offset;
-       if (i915_is_ggtt(vm))
-               vma = i915_gem_obj_to_ggtt(src);
-       use_ggtt = (src->cache_level == I915_CACHE_NONE &&
-                  vma && (vma->bound & GLOBAL_BIND) &&
-                  reloc_offset + num_pages * PAGE_SIZE <= ggtt->mappable_end);
-
-       /* Cannot access stolen address directly, try to use the aperture */
-       if (src->stolen) {
-               use_ggtt = true;
+       dst->gtt_offset = vma->node.start;
+       dst->gtt_size = vma->node.size;
+       dst->page_count = 0;
+       dst->unused = 0;
 
-               if (!(vma && vma->bound & GLOBAL_BIND))
-                       goto unwind;
-
-               reloc_offset = i915_gem_obj_ggtt_offset(src);
-               if (reloc_offset + num_pages * PAGE_SIZE > ggtt->mappable_end)
-                       goto unwind;
+       if (!compress_init(&zstream)) {
+               kfree(dst);
+               return NULL;
        }
 
-       /* Cannot access snooped pages through the aperture */
-       if (use_ggtt && src->cache_level != I915_CACHE_NONE &&
-           !HAS_LLC(dev_priv))
-               goto unwind;
-
-       dst->page_count = num_pages;
-       while (num_pages--) {
-               unsigned long flags;
-               void *d;
-
-               d = kmalloc(PAGE_SIZE, GFP_ATOMIC);
-               if (d == NULL)
-                       goto unwind;
-
-               local_irq_save(flags);
-               if (use_ggtt) {
-                       void __iomem *s;
+       for_each_sgt_dma(dma, iter, vma->pages) {
+               void __iomem *s;
+               int ret;
 
-                       /* Simply ignore tiling or any overlapping fence.
-                        * It's part of the error state, and this hopefully
-                        * captures what the GPU read.
-                        */
-
-                       s = io_mapping_map_atomic_wc(ggtt->mappable,
-                                                    reloc_offset);
-                       memcpy_fromio(d, s, PAGE_SIZE);
-                       io_mapping_unmap_atomic(s);
-               } else {
-                       struct page *page;
-                       void *s;
+               ggtt->base.insert_page(&ggtt->base, dma, slot,
+                                      I915_CACHE_NONE, 0);
 
-                       page = i915_gem_object_get_page(src, i);
+               s = io_mapping_map_atomic_wc(&ggtt->mappable, slot);
+               ret = compress_page(&zstream, (void  __force *)s, dst);
+               io_mapping_unmap_atomic(s);
 
-                       drm_clflush_pages(&page, 1);
+               if (ret)
+                       goto unwind;
+       }
+       goto out;
 
-                       s = kmap_atomic(page);
-                       memcpy(d, s, PAGE_SIZE);
-                       kunmap_atomic(s);
+unwind:
+       while (dst->page_count--)
+               free_page((unsigned long)dst->pages[dst->page_count]);
+       kfree(dst);
+       dst = NULL;
 
-                       drm_clflush_pages(&page, 1);
-               }
-               local_irq_restore(flags);
+out:
+       compress_fini(&zstream, dst);
+       ggtt->base.clear_range(&ggtt->base, slot, PAGE_SIZE);
+       return dst;
+}
 
-               dst->pages[i++] = d;
-               reloc_offset += PAGE_SIZE;
-       }
+/* The error capture is special as tries to run underneath the normal
+ * locking rules - so we use the raw version of the i915_gem_active lookup.
+ */
+static inline uint32_t
+__active_get_seqno(struct i915_gem_active *active)
+{
+       return i915_gem_request_get_seqno(__i915_gem_active_peek(active));
+}
 
-       return dst;
+static inline int
+__active_get_engine_id(struct i915_gem_active *active)
+{
+       struct intel_engine_cs *engine;
 
-unwind:
-       while (i--)
-               kfree(dst->pages[i]);
-       kfree(dst);
-       return NULL;
+       engine = i915_gem_request_get_engine(__i915_gem_active_peek(active));
+       return engine ? engine->id : -1;
 }
-#define i915_error_ggtt_object_create(dev_priv, src) \
-       i915_error_object_create((dev_priv), (src), &(dev_priv)->ggtt.base)
 
 static void capture_bo(struct drm_i915_error_buffer *err,
                       struct i915_vma *vma)
@@ -748,32 +881,34 @@ static void capture_bo(struct drm_i915_error_buffer *err,
 
        err->size = obj->base.size;
        err->name = obj->base.name;
+
        for (i = 0; i < I915_NUM_ENGINES; i++)
-               err->rseqno[i] = i915_gem_request_get_seqno(obj->last_read_req[i]);
-       err->wseqno = i915_gem_request_get_seqno(obj->last_write_req);
+               err->rseqno[i] = __active_get_seqno(&vma->last_read[i]);
+       err->wseqno = __active_get_seqno(&vma->last_write);
+       err->engine = __active_get_engine_id(&vma->last_write);
+
        err->gtt_offset = vma->node.start;
        err->read_domains = obj->base.read_domains;
        err->write_domain = obj->base.write_domain;
-       err->fence_reg = obj->fence_reg;
-       err->pinned = 0;
-       if (i915_gem_obj_is_pinned(obj))
-               err->pinned = 1;
-       err->tiling = obj->tiling_mode;
-       err->dirty = obj->dirty;
-       err->purgeable = obj->madv != I915_MADV_WILLNEED;
+       err->fence_reg = vma->fence ? vma->fence->id : -1;
+       err->tiling = i915_gem_object_get_tiling(obj);
+       err->dirty = obj->mm.dirty;
+       err->purgeable = obj->mm.madv != I915_MADV_WILLNEED;
        err->userptr = obj->userptr.mm != NULL;
-       err->ring = obj->last_write_req ?
-                       i915_gem_request_get_engine(obj->last_write_req)->id : -1;
        err->cache_level = obj->cache_level;
 }
 
-static u32 capture_active_bo(struct drm_i915_error_buffer *err,
-                            int count, struct list_head *head)
+static u32 capture_error_bo(struct drm_i915_error_buffer *err,
+                           int count, struct list_head *head,
+                           bool pinned_only)
 {
        struct i915_vma *vma;
        int i = 0;
 
        list_for_each_entry(vma, head, vm_link) {
+               if (pinned_only && !i915_vma_is_pinned(vma))
+                       continue;
+
                capture_bo(err++, vma);
                if (++i == count)
                        break;
@@ -782,28 +917,6 @@ static u32 capture_active_bo(struct drm_i915_error_buffer *err,
        return i;
 }
 
-static u32 capture_pinned_bo(struct drm_i915_error_buffer *err,
-                            int count, struct list_head *head,
-                            struct i915_address_space *vm)
-{
-       struct drm_i915_gem_object *obj;
-       struct drm_i915_error_buffer * const first = err;
-       struct drm_i915_error_buffer * const last = err + count;
-
-       list_for_each_entry(obj, head, global_list) {
-               struct i915_vma *vma;
-
-               if (err == last)
-                       break;
-
-               list_for_each_entry(vma, &obj->vma_list, obj_link)
-                       if (vma->vm == vm && vma->pin_count > 0)
-                               capture_bo(err++, vma);
-       }
-
-       return err - first;
-}
-
 /* Generate a semi-unique error code. The code is not meant to have meaning, The
  * code's only purpose is to try to prevent false duplicated bug reports by
  * grossly estimating a GPU error state.
@@ -815,7 +928,7 @@ static u32 capture_pinned_bo(struct drm_i915_error_buffer *err,
  */
 static uint32_t i915_error_generate_code(struct drm_i915_private *dev_priv,
                                         struct drm_i915_error_state *error,
-                                        int *ring_id)
+                                        int *engine_id)
 {
        uint32_t error_code = 0;
        int i;
@@ -826,11 +939,12 @@ static uint32_t i915_error_generate_code(struct drm_i915_private *dev_priv,
         * strictly a client bug. Use instdone to differentiate those some.
         */
        for (i = 0; i < I915_NUM_ENGINES; i++) {
-               if (error->ring[i].hangcheck_action == HANGCHECK_HUNG) {
-                       if (ring_id)
-                               *ring_id = i;
+               if (error->engine[i].hangcheck_action == HANGCHECK_HUNG) {
+                       if (engine_id)
+                               *engine_id = i;
 
-                       return error->ring[i].ipehr ^ error->ring[i].instdone;
+                       return error->engine[i].ipehr ^
+                              error->engine[i].instdone.instdone;
                }
        }
 
@@ -854,24 +968,39 @@ static void i915_gem_record_fences(struct drm_i915_private *dev_priv,
        }
 }
 
+static inline u32
+gen8_engine_sync_index(struct intel_engine_cs *engine,
+                      struct intel_engine_cs *other)
+{
+       int idx;
+
+       /*
+        * rcs -> 0 = vcs, 1 = bcs, 2 = vecs, 3 = vcs2;
+        * vcs -> 0 = bcs, 1 = vecs, 2 = vcs2, 3 = rcs;
+        * bcs -> 0 = vecs, 1 = vcs2. 2 = rcs, 3 = vcs;
+        * vecs -> 0 = vcs2, 1 = rcs, 2 = vcs, 3 = bcs;
+        * vcs2 -> 0 = rcs, 1 = vcs, 2 = bcs, 3 = vecs;
+        */
 
-static void gen8_record_semaphore_state(struct drm_i915_private *dev_priv,
-                                       struct drm_i915_error_state *error,
+       idx = (other - engine) - 1;
+       if (idx < 0)
+               idx += I915_NUM_ENGINES;
+
+       return idx;
+}
+
+static void gen8_record_semaphore_state(struct drm_i915_error_state *error,
                                        struct intel_engine_cs *engine,
-                                       struct drm_i915_error_ring *ering)
+                                       struct drm_i915_error_engine *ee)
 {
+       struct drm_i915_private *dev_priv = engine->i915;
        struct intel_engine_cs *to;
        enum intel_engine_id id;
 
-       if (!i915_semaphore_is_enabled(dev_priv))
+       if (!error->semaphore)
                return;
 
-       if (!error->semaphore_obj)
-               error->semaphore_obj =
-                       i915_error_ggtt_object_create(dev_priv,
-                                                     dev_priv->semaphore_obj);
-
-       for_each_engine_id(to, dev_priv, id) {
+       for_each_engine(to, dev_priv, id) {
                int idx;
                u16 signal_offset;
                u32 *tmp;
@@ -879,48 +1008,50 @@ static void gen8_record_semaphore_state(struct drm_i915_private *dev_priv,
                if (engine == to)
                        continue;
 
-               signal_offset = (GEN8_SIGNAL_OFFSET(engine, id) & (PAGE_SIZE - 1))
-                               / 4;
-               tmp = error->semaphore_obj->pages[0];
-               idx = intel_ring_sync_index(engine, to);
+               signal_offset =
+                       (GEN8_SIGNAL_OFFSET(engine, id) & (PAGE_SIZE - 1)) / 4;
+               tmp = error->semaphore->pages[0];
+               idx = gen8_engine_sync_index(engine, to);
 
-               ering->semaphore_mboxes[idx] = tmp[signal_offset];
-               ering->semaphore_seqno[idx] = engine->semaphore.sync_seqno[idx];
+               ee->semaphore_mboxes[idx] = tmp[signal_offset];
        }
 }
 
-static void gen6_record_semaphore_state(struct drm_i915_private *dev_priv,
-                                       struct intel_engine_cs *engine,
-                                       struct drm_i915_error_ring *ering)
+static void gen6_record_semaphore_state(struct intel_engine_cs *engine,
+                                       struct drm_i915_error_engine *ee)
 {
-       ering->semaphore_mboxes[0] = I915_READ(RING_SYNC_0(engine->mmio_base));
-       ering->semaphore_mboxes[1] = I915_READ(RING_SYNC_1(engine->mmio_base));
-       ering->semaphore_seqno[0] = engine->semaphore.sync_seqno[0];
-       ering->semaphore_seqno[1] = engine->semaphore.sync_seqno[1];
+       struct drm_i915_private *dev_priv = engine->i915;
 
-       if (HAS_VEBOX(dev_priv)) {
-               ering->semaphore_mboxes[2] =
+       ee->semaphore_mboxes[0] = I915_READ(RING_SYNC_0(engine->mmio_base));
+       ee->semaphore_mboxes[1] = I915_READ(RING_SYNC_1(engine->mmio_base));
+       if (HAS_VEBOX(dev_priv))
+               ee->semaphore_mboxes[2] =
                        I915_READ(RING_SYNC_2(engine->mmio_base));
-               ering->semaphore_seqno[2] = engine->semaphore.sync_seqno[2];
-       }
 }
 
-static void engine_record_waiters(struct intel_engine_cs *engine,
-                                 struct drm_i915_error_ring *ering)
+static void error_record_engine_waiters(struct intel_engine_cs *engine,
+                                       struct drm_i915_error_engine *ee)
 {
        struct intel_breadcrumbs *b = &engine->breadcrumbs;
        struct drm_i915_error_waiter *waiter;
        struct rb_node *rb;
        int count;
 
-       ering->num_waiters = 0;
-       ering->waiters = NULL;
+       ee->num_waiters = 0;
+       ee->waiters = NULL;
+
+       if (RB_EMPTY_ROOT(&b->waiters))
+               return;
+
+       if (!spin_trylock_irq(&b->lock)) {
+               ee->waiters = ERR_PTR(-EDEADLK);
+               return;
+       }
 
-       spin_lock(&b->lock);
        count = 0;
        for (rb = rb_first(&b->waiters); rb != NULL; rb = rb_next(rb))
                count++;
-       spin_unlock(&b->lock);
+       spin_unlock_irq(&b->lock);
 
        waiter = NULL;
        if (count)
@@ -930,9 +1061,13 @@ static void engine_record_waiters(struct intel_engine_cs *engine,
        if (!waiter)
                return;
 
-       ering->waiters = waiter;
+       if (!spin_trylock_irq(&b->lock)) {
+               kfree(waiter);
+               ee->waiters = ERR_PTR(-EDEADLK);
+               return;
+       }
 
-       spin_lock(&b->lock);
+       ee->waiters = waiter;
        for (rb = rb_first(&b->waiters); rb; rb = rb_next(rb)) {
                struct intel_wait *w = container_of(rb, typeof(*w), node);
 
@@ -941,57 +1076,59 @@ static void engine_record_waiters(struct intel_engine_cs *engine,
                waiter->seqno = w->seqno;
                waiter++;
 
-               if (++ering->num_waiters == count)
+               if (++ee->num_waiters == count)
                        break;
        }
-       spin_unlock(&b->lock);
+       spin_unlock_irq(&b->lock);
 }
 
-static void i915_record_ring_state(struct drm_i915_private *dev_priv,
-                                  struct drm_i915_error_state *error,
-                                  struct intel_engine_cs *engine,
-                                  struct drm_i915_error_ring *ering)
+static void error_record_engine_registers(struct drm_i915_error_state *error,
+                                         struct intel_engine_cs *engine,
+                                         struct drm_i915_error_engine *ee)
 {
+       struct drm_i915_private *dev_priv = engine->i915;
+
        if (INTEL_GEN(dev_priv) >= 6) {
-               ering->rc_psmi = I915_READ(RING_PSMI_CTL(engine->mmio_base));
-               ering->fault_reg = I915_READ(RING_FAULT_REG(engine));
+               ee->rc_psmi = I915_READ(RING_PSMI_CTL(engine->mmio_base));
+               ee->fault_reg = I915_READ(RING_FAULT_REG(engine));
                if (INTEL_GEN(dev_priv) >= 8)
-                       gen8_record_semaphore_state(dev_priv, error, engine,
-                                                   ering);
+                       gen8_record_semaphore_state(error, engine, ee);
                else
-                       gen6_record_semaphore_state(dev_priv, engine, ering);
+                       gen6_record_semaphore_state(engine, ee);
        }
 
        if (INTEL_GEN(dev_priv) >= 4) {
-               ering->faddr = I915_READ(RING_DMA_FADD(engine->mmio_base));
-               ering->ipeir = I915_READ(RING_IPEIR(engine->mmio_base));
-               ering->ipehr = I915_READ(RING_IPEHR(engine->mmio_base));
-               ering->instdone = I915_READ(RING_INSTDONE(engine->mmio_base));
-               ering->instps = I915_READ(RING_INSTPS(engine->mmio_base));
-               ering->bbaddr = I915_READ(RING_BBADDR(engine->mmio_base));
+               ee->faddr = I915_READ(RING_DMA_FADD(engine->mmio_base));
+               ee->ipeir = I915_READ(RING_IPEIR(engine->mmio_base));
+               ee->ipehr = I915_READ(RING_IPEHR(engine->mmio_base));
+               ee->instps = I915_READ(RING_INSTPS(engine->mmio_base));
+               ee->bbaddr = I915_READ(RING_BBADDR(engine->mmio_base));
                if (INTEL_GEN(dev_priv) >= 8) {
-                       ering->faddr |= (u64) I915_READ(RING_DMA_FADD_UDW(engine->mmio_base)) << 32;
-                       ering->bbaddr |= (u64) I915_READ(RING_BBADDR_UDW(engine->mmio_base)) << 32;
+                       ee->faddr |= (u64) I915_READ(RING_DMA_FADD_UDW(engine->mmio_base)) << 32;
+                       ee->bbaddr |= (u64) I915_READ(RING_BBADDR_UDW(engine->mmio_base)) << 32;
                }
-               ering->bbstate = I915_READ(RING_BBSTATE(engine->mmio_base));
+               ee->bbstate = I915_READ(RING_BBSTATE(engine->mmio_base));
        } else {
-               ering->faddr = I915_READ(DMA_FADD_I8XX);
-               ering->ipeir = I915_READ(IPEIR);
-               ering->ipehr = I915_READ(IPEHR);
-               ering->instdone = I915_READ(GEN2_INSTDONE);
+               ee->faddr = I915_READ(DMA_FADD_I8XX);
+               ee->ipeir = I915_READ(IPEIR);
+               ee->ipehr = I915_READ(IPEHR);
        }
 
-       ering->waiting = intel_engine_has_waiter(engine);
-       ering->instpm = I915_READ(RING_INSTPM(engine->mmio_base));
-       ering->acthd = intel_ring_get_active_head(engine);
-       ering->seqno = intel_engine_get_seqno(engine);
-       ering->last_seqno = engine->last_submitted_seqno;
-       ering->start = I915_READ_START(engine);
-       ering->head = I915_READ_HEAD(engine);
-       ering->tail = I915_READ_TAIL(engine);
-       ering->ctl = I915_READ_CTL(engine);
-
-       if (I915_NEED_GFX_HWS(dev_priv)) {
+       intel_engine_get_instdone(engine, &ee->instdone);
+
+       ee->waiting = intel_engine_has_waiter(engine);
+       ee->instpm = I915_READ(RING_INSTPM(engine->mmio_base));
+       ee->acthd = intel_engine_get_active_head(engine);
+       ee->seqno = intel_engine_get_seqno(engine);
+       ee->last_seqno = intel_engine_last_submit(engine);
+       ee->start = I915_READ_START(engine);
+       ee->head = I915_READ_HEAD(engine);
+       ee->tail = I915_READ_TAIL(engine);
+       ee->ctl = I915_READ_CTL(engine);
+       if (INTEL_GEN(dev_priv) > 2)
+               ee->mode = I915_READ_MODE(engine);
+
+       if (!HWS_NEEDS_PHYSICAL(dev_priv)) {
                i915_reg_t mmio;
 
                if (IS_GEN7(dev_priv)) {
@@ -1017,107 +1154,166 @@ static void i915_record_ring_state(struct drm_i915_private *dev_priv,
                        mmio = RING_HWS_PGA(engine->mmio_base);
                }
 
-               ering->hws = I915_READ(mmio);
+               ee->hws = I915_READ(mmio);
        }
 
-       ering->hangcheck_score = engine->hangcheck.score;
-       ering->hangcheck_action = engine->hangcheck.action;
+       ee->hangcheck_score = engine->hangcheck.score;
+       ee->hangcheck_action = engine->hangcheck.action;
 
        if (USES_PPGTT(dev_priv)) {
                int i;
 
-               ering->vm_info.gfx_mode = I915_READ(RING_MODE_GEN7(engine));
+               ee->vm_info.gfx_mode = I915_READ(RING_MODE_GEN7(engine));
 
                if (IS_GEN6(dev_priv))
-                       ering->vm_info.pp_dir_base =
+                       ee->vm_info.pp_dir_base =
                                I915_READ(RING_PP_DIR_BASE_READ(engine));
                else if (IS_GEN7(dev_priv))
-                       ering->vm_info.pp_dir_base =
+                       ee->vm_info.pp_dir_base =
                                I915_READ(RING_PP_DIR_BASE(engine));
                else if (INTEL_GEN(dev_priv) >= 8)
                        for (i = 0; i < 4; i++) {
-                               ering->vm_info.pdp[i] =
+                               ee->vm_info.pdp[i] =
                                        I915_READ(GEN8_RING_PDP_UDW(engine, i));
-                               ering->vm_info.pdp[i] <<= 32;
-                               ering->vm_info.pdp[i] |=
+                               ee->vm_info.pdp[i] <<= 32;
+                               ee->vm_info.pdp[i] |=
                                        I915_READ(GEN8_RING_PDP_LDW(engine, i));
                        }
        }
 }
 
+static void record_request(struct drm_i915_gem_request *request,
+                          struct drm_i915_error_request *erq)
+{
+       erq->context = request->ctx->hw_id;
+       erq->seqno = request->global_seqno;
+       erq->jiffies = request->emitted_jiffies;
+       erq->head = request->head;
+       erq->tail = request->tail;
+
+       rcu_read_lock();
+       erq->pid = request->ctx->pid ? pid_nr(request->ctx->pid) : 0;
+       rcu_read_unlock();
+}
 
-static void i915_gem_record_active_context(struct intel_engine_cs *engine,
-                                          struct drm_i915_error_state *error,
-                                          struct drm_i915_error_ring *ering)
+static void engine_record_requests(struct intel_engine_cs *engine,
+                                  struct drm_i915_gem_request *first,
+                                  struct drm_i915_error_engine *ee)
 {
-       struct drm_i915_private *dev_priv = engine->i915;
-       struct drm_i915_gem_object *obj;
+       struct drm_i915_gem_request *request;
+       int count;
 
-       /* Currently render ring is the only HW context user */
-       if (engine->id != RCS || !error->ccid)
+       count = 0;
+       request = first;
+       list_for_each_entry_from(request, &engine->timeline->requests, link)
+               count++;
+       if (!count)
                return;
 
-       list_for_each_entry(obj, &dev_priv->mm.bound_list, global_list) {
-               if (!i915_gem_obj_ggtt_bound(obj))
-                       continue;
+       ee->requests = kcalloc(count, sizeof(*ee->requests), GFP_ATOMIC);
+       if (!ee->requests)
+               return;
 
-               if ((error->ccid & PAGE_MASK) == i915_gem_obj_ggtt_offset(obj)) {
-                       ering->ctx = i915_error_ggtt_object_create(dev_priv, obj);
+       ee->num_requests = count;
+
+       count = 0;
+       request = first;
+       list_for_each_entry_from(request, &engine->timeline->requests, link) {
+               if (count >= ee->num_requests) {
+                       /*
+                        * If the ring request list was changed in
+                        * between the point where the error request
+                        * list was created and dimensioned and this
+                        * point then just exit early to avoid crashes.
+                        *
+                        * We don't need to communicate that the
+                        * request list changed state during error
+                        * state capture and that the error state is
+                        * slightly incorrect as a consequence since we
+                        * are typically only interested in the request
+                        * list state at the point of error state
+                        * capture, not in any changes happening during
+                        * the capture.
+                        */
                        break;
                }
+
+               record_request(request, &ee->requests[count++]);
        }
+       ee->num_requests = count;
+}
+
+static void error_record_engine_execlists(struct intel_engine_cs *engine,
+                                         struct drm_i915_error_engine *ee)
+{
+       unsigned int n;
+
+       for (n = 0; n < ARRAY_SIZE(engine->execlist_port); n++)
+               if (engine->execlist_port[n].request)
+                       record_request(engine->execlist_port[n].request,
+                                      &ee->execlist[n]);
 }
 
 static void i915_gem_record_rings(struct drm_i915_private *dev_priv,
                                  struct drm_i915_error_state *error)
 {
        struct i915_ggtt *ggtt = &dev_priv->ggtt;
-       struct drm_i915_gem_request *request;
-       int i, count;
+       int i;
+
+       error->semaphore =
+               i915_error_object_create(dev_priv, dev_priv->semaphore);
 
        for (i = 0; i < I915_NUM_ENGINES; i++) {
-               struct intel_engine_cs *engine = &dev_priv->engine[i];
+               struct intel_engine_cs *engine = dev_priv->engine[i];
+               struct drm_i915_error_engine *ee = &error->engine[i];
+               struct drm_i915_gem_request *request;
 
-               error->ring[i].pid = -1;
+               ee->pid = -1;
+               ee->engine_id = -1;
 
-               if (!intel_engine_initialized(engine))
+               if (!engine)
                        continue;
 
-               error->ring[i].valid = true;
+               ee->engine_id = i;
 
-               i915_record_ring_state(dev_priv, error, engine, &error->ring[i]);
-               engine_record_waiters(engine, &error->ring[i]);
+               error_record_engine_registers(error, engine, ee);
+               error_record_engine_waiters(engine, ee);
+               error_record_engine_execlists(engine, ee);
 
                request = i915_gem_find_active_request(engine);
                if (request) {
-                       struct i915_address_space *vm;
-                       struct intel_ringbuffer *rb;
+                       struct intel_ring *ring;
+                       struct pid *pid;
 
-                       vm = request->ctx->ppgtt ?
+                       ee->vm = request->ctx->ppgtt ?
                                &request->ctx->ppgtt->base : &ggtt->base;
 
                        /* We need to copy these to an anonymous buffer
                         * as the simplest method to avoid being overwritten
                         * by userspace.
                         */
-                       error->ring[i].batchbuffer =
+                       ee->batchbuffer =
                                i915_error_object_create(dev_priv,
-                                                        request->batch_obj,
-                                                        vm);
+                                                        request->batch);
 
                        if (HAS_BROKEN_CS_TLB(dev_priv))
-                               error->ring[i].wa_batchbuffer =
-                                       i915_error_ggtt_object_create(dev_priv,
-                                                            engine->scratch.obj);
+                               ee->wa_batchbuffer =
+                                       i915_error_object_create(dev_priv,
+                                                                engine->scratch);
+
+                       ee->ctx =
+                               i915_error_object_create(dev_priv,
+                                                        request->ctx->engine[i].state);
 
-                       if (request->pid) {
+                       pid = request->ctx->pid;
+                       if (pid) {
                                struct task_struct *task;
 
                                rcu_read_lock();
-                               task = pid_task(request->pid, PIDTYPE_PID);
+                               task = pid_task(pid, PIDTYPE_PID);
                                if (task) {
-                                       strcpy(error->ring[i].comm, task->comm);
-                                       error->ring[i].pid = task->pid;
+                                       strcpy(ee->comm, task->comm);
+                                       ee->pid = task->pid;
                                }
                                rcu_read_unlock();
                        }
@@ -1125,151 +1321,119 @@ static void i915_gem_record_rings(struct drm_i915_private *dev_priv,
                        error->simulated |=
                                request->ctx->flags & CONTEXT_NO_ERROR_CAPTURE;
 
-                       rb = request->ringbuf;
-                       error->ring[i].cpu_ring_head = rb->head;
-                       error->ring[i].cpu_ring_tail = rb->tail;
-                       error->ring[i].ringbuffer =
-                               i915_error_ggtt_object_create(dev_priv,
-                                                             rb->obj);
-               }
+                       ee->rq_head = request->head;
+                       ee->rq_post = request->postfix;
+                       ee->rq_tail = request->tail;
 
-               error->ring[i].hws_page =
-                       i915_error_ggtt_object_create(dev_priv,
-                                                     engine->status_page.obj);
+                       ring = request->ring;
+                       ee->cpu_ring_head = ring->head;
+                       ee->cpu_ring_tail = ring->tail;
+                       ee->ringbuffer =
+                               i915_error_object_create(dev_priv, ring->vma);
 
-               if (engine->wa_ctx.obj) {
-                       error->ring[i].wa_ctx =
-                               i915_error_ggtt_object_create(dev_priv,
-                                                             engine->wa_ctx.obj);
-               }
-
-               i915_gem_record_active_context(engine, error, &error->ring[i]);
-
-               count = 0;
-               list_for_each_entry(request, &engine->request_list, list)
-                       count++;
-
-               error->ring[i].num_requests = count;
-               error->ring[i].requests =
-                       kcalloc(count, sizeof(*error->ring[i].requests),
-                               GFP_ATOMIC);
-               if (error->ring[i].requests == NULL) {
-                       error->ring[i].num_requests = 0;
-                       continue;
+                       engine_record_requests(engine, request, ee);
                }
 
-               count = 0;
-               list_for_each_entry(request, &engine->request_list, list) {
-                       struct drm_i915_error_request *erq;
-
-                       if (count >= error->ring[i].num_requests) {
-                               /*
-                                * If the ring request list was changed in
-                                * between the point where the error request
-                                * list was created and dimensioned and this
-                                * point then just exit early to avoid crashes.
-                                *
-                                * We don't need to communicate that the
-                                * request list changed state during error
-                                * state capture and that the error state is
-                                * slightly incorrect as a consequence since we
-                                * are typically only interested in the request
-                                * list state at the point of error state
-                                * capture, not in any changes happening during
-                                * the capture.
-                                */
-                               break;
-                       }
+               ee->hws_page =
+                       i915_error_object_create(dev_priv,
+                                                engine->status_page.vma);
 
-                       erq = &error->ring[i].requests[count++];
-                       erq->seqno = request->seqno;
-                       erq->jiffies = request->emitted_jiffies;
-                       erq->tail = request->postfix;
-               }
+               ee->wa_ctx =
+                       i915_error_object_create(dev_priv, engine->wa_ctx.vma);
        }
 }
 
-/* FIXME: Since pin count/bound list is global, we duplicate what we capture per
- * VM.
- */
 static void i915_gem_capture_vm(struct drm_i915_private *dev_priv,
                                struct drm_i915_error_state *error,
                                struct i915_address_space *vm,
-                               const int ndx)
+                               int idx)
 {
-       struct drm_i915_error_buffer *active_bo = NULL, *pinned_bo = NULL;
-       struct drm_i915_gem_object *obj;
+       struct drm_i915_error_buffer *active_bo;
        struct i915_vma *vma;
-       int i;
+       int count;
 
-       i = 0;
+       count = 0;
        list_for_each_entry(vma, &vm->active_list, vm_link)
-               i++;
-       error->active_bo_count[ndx] = i;
+               count++;
 
-       list_for_each_entry(obj, &dev_priv->mm.bound_list, global_list) {
-               list_for_each_entry(vma, &obj->vma_list, obj_link)
-                       if (vma->vm == vm && vma->pin_count > 0)
-                               i++;
-       }
-       error->pinned_bo_count[ndx] = i - error->active_bo_count[ndx];
+       active_bo = NULL;
+       if (count)
+               active_bo = kcalloc(count, sizeof(*active_bo), GFP_ATOMIC);
+       if (active_bo)
+               count = capture_error_bo(active_bo, count, &vm->active_list, false);
+       else
+               count = 0;
+
+       error->active_vm[idx] = vm;
+       error->active_bo[idx] = active_bo;
+       error->active_bo_count[idx] = count;
+}
+
+static void i915_capture_active_buffers(struct drm_i915_private *dev_priv,
+                                       struct drm_i915_error_state *error)
+{
+       int cnt = 0, i, j;
 
-       if (i) {
-               active_bo = kcalloc(i, sizeof(*active_bo), GFP_ATOMIC);
-               if (active_bo)
-                       pinned_bo = active_bo + error->active_bo_count[ndx];
+       BUILD_BUG_ON(ARRAY_SIZE(error->engine) > ARRAY_SIZE(error->active_bo));
+       BUILD_BUG_ON(ARRAY_SIZE(error->active_bo) != ARRAY_SIZE(error->active_vm));
+       BUILD_BUG_ON(ARRAY_SIZE(error->active_bo) != ARRAY_SIZE(error->active_bo_count));
+
+       /* Scan each engine looking for unique active contexts/vm */
+       for (i = 0; i < ARRAY_SIZE(error->engine); i++) {
+               struct drm_i915_error_engine *ee = &error->engine[i];
+               bool found;
+
+               if (!ee->vm)
+                       continue;
+
+               found = false;
+               for (j = 0; j < i && !found; j++)
+                       found = error->engine[j].vm == ee->vm;
+               if (!found)
+                       i915_gem_capture_vm(dev_priv, error, ee->vm, cnt++);
        }
+}
 
-       if (active_bo)
-               error->active_bo_count[ndx] =
-                       capture_active_bo(active_bo,
-                                         error->active_bo_count[ndx],
-                                         &vm->active_list);
-
-       if (pinned_bo)
-               error->pinned_bo_count[ndx] =
-                       capture_pinned_bo(pinned_bo,
-                                         error->pinned_bo_count[ndx],
-                                         &dev_priv->mm.bound_list, vm);
-       error->active_bo[ndx] = active_bo;
-       error->pinned_bo[ndx] = pinned_bo;
+static void i915_capture_pinned_buffers(struct drm_i915_private *dev_priv,
+                                       struct drm_i915_error_state *error)
+{
+       struct i915_address_space *vm = &dev_priv->ggtt.base;
+       struct drm_i915_error_buffer *bo;
+       struct i915_vma *vma;
+       int count_inactive, count_active;
+
+       count_inactive = 0;
+       list_for_each_entry(vma, &vm->active_list, vm_link)
+               count_inactive++;
+
+       count_active = 0;
+       list_for_each_entry(vma, &vm->inactive_list, vm_link)
+               count_active++;
+
+       bo = NULL;
+       if (count_inactive + count_active)
+               bo = kcalloc(count_inactive + count_active,
+                            sizeof(*bo), GFP_ATOMIC);
+       if (!bo)
+               return;
+
+       count_inactive = capture_error_bo(bo, count_inactive,
+                                         &vm->active_list, true);
+       count_active = capture_error_bo(bo + count_inactive, count_active,
+                                       &vm->inactive_list, true);
+       error->pinned_bo_count = count_inactive + count_active;
+       error->pinned_bo = bo;
 }
 
-static void i915_gem_capture_buffers(struct drm_i915_private *dev_priv,
-                                    struct drm_i915_error_state *error)
+static void i915_gem_capture_guc_log_buffer(struct drm_i915_private *dev_priv,
+                                           struct drm_i915_error_state *error)
 {
-       struct i915_address_space *vm;
-       int cnt = 0, i = 0;
-
-       list_for_each_entry(vm, &dev_priv->vm_list, global_link)
-               cnt++;
-
-       error->active_bo = kcalloc(cnt, sizeof(*error->active_bo), GFP_ATOMIC);
-       error->pinned_bo = kcalloc(cnt, sizeof(*error->pinned_bo), GFP_ATOMIC);
-       error->active_bo_count = kcalloc(cnt, sizeof(*error->active_bo_count),
-                                        GFP_ATOMIC);
-       error->pinned_bo_count = kcalloc(cnt, sizeof(*error->pinned_bo_count),
-                                        GFP_ATOMIC);
-
-       if (error->active_bo == NULL ||
-           error->pinned_bo == NULL ||
-           error->active_bo_count == NULL ||
-           error->pinned_bo_count == NULL) {
-               kfree(error->active_bo);
-               kfree(error->active_bo_count);
-               kfree(error->pinned_bo);
-               kfree(error->pinned_bo_count);
-
-               error->active_bo = NULL;
-               error->active_bo_count = NULL;
-               error->pinned_bo = NULL;
-               error->pinned_bo_count = NULL;
-       } else {
-               list_for_each_entry(vm, &dev_priv->vm_list, global_link)
-                       i915_gem_capture_vm(dev_priv, error, vm, i++);
+       /* Capturing log buf contents won't be useful if logging was disabled */
+       if (!dev_priv->guc.log.vma || (i915.guc_log_level < 0))
+               return;
 
-               error->vm_count = cnt;
-       }
+       error->guc_log = i915_error_object_create(dev_priv,
+                                                 dev_priv->guc.log.vma);
 }
 
 /* Capture all registers which don't fit into another category. */
@@ -1288,13 +1452,13 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,
         */
 
        /* 1: Registers specific to a single generation */
-       if (IS_VALLEYVIEW(dev)) {
+       if (IS_VALLEYVIEW(dev_priv)) {
                error->gtier[0] = I915_READ(GTIER);
                error->ier = I915_READ(VLV_IER);
                error->forcewake = I915_READ_FW(FORCEWAKE_VLV);
        }
 
-       if (IS_GEN7(dev))
+       if (IS_GEN7(dev_priv))
                error->err_int = I915_READ(GEN7_ERR_INT);
 
        if (INTEL_INFO(dev)->gen >= 8) {
@@ -1302,7 +1466,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,
                error->fault_data1 = I915_READ(GEN8_FAULT_TLB_DATA1);
        }
 
-       if (IS_GEN6(dev)) {
+       if (IS_GEN6(dev_priv)) {
                error->forcewake = I915_READ_FW(FORCEWAKE);
                error->gab_ctl = I915_READ(GAB_CTL);
                error->gfx_mode = I915_READ(GFX_MODE);
@@ -1319,7 +1483,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,
        }
 
        /* 3: Feature specific registers */
-       if (IS_GEN6(dev) || IS_GEN7(dev)) {
+       if (IS_GEN6(dev_priv) || IS_GEN7(dev_priv)) {
                error->gam_ecochk = I915_READ(GAM_ECOCHK);
                error->gac_eco = I915_READ(GAC_ECO_BITS);
        }
@@ -1332,18 +1496,16 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,
                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)) {
+       } else if (HAS_PCH_SPLIT(dev_priv)) {
                error->ier = I915_READ(DEIER);
                error->gtier[0] = I915_READ(GTIER);
-       } else if (IS_GEN2(dev)) {
+       } else if (IS_GEN2(dev_priv)) {
                error->ier = I915_READ16(IER);
-       } else if (!IS_VALLEYVIEW(dev)) {
+       } else if (!IS_VALLEYVIEW(dev_priv)) {
                error->ier = I915_READ(IER);
        }
        error->eir = I915_READ(EIR);
        error->pgtbl_er = I915_READ(PGTBL_ER);
-
-       i915_get_extra_instdone(dev_priv, error->extra_instdone);
 }
 
 static void i915_error_capture_msg(struct drm_i915_private *dev_priv,
@@ -1352,20 +1514,20 @@ static void i915_error_capture_msg(struct drm_i915_private *dev_priv,
                                   const char *error_msg)
 {
        u32 ecode;
-       int ring_id = -1, len;
+       int engine_id = -1, len;
 
-       ecode = i915_error_generate_code(dev_priv, error, &ring_id);
+       ecode = i915_error_generate_code(dev_priv, error, &engine_id);
 
        len = scnprintf(error->error_msg, sizeof(error->error_msg),
                        "GPU HANG: ecode %d:%d:0x%08x",
-                       INTEL_GEN(dev_priv), ring_id, ecode);
+                       INTEL_GEN(dev_priv), engine_id, ecode);
 
-       if (ring_id != -1 && error->ring[ring_id].pid != -1)
+       if (engine_id != -1 && error->engine[engine_id].pid != -1)
                len += scnprintf(error->error_msg + len,
                                 sizeof(error->error_msg) - len,
                                 ", in %s [%d]",
-                                error->ring[ring_id].comm,
-                                error->ring[ring_id].pid);
+                                error->engine[engine_id].comm,
+                                error->engine[engine_id].pid);
 
        scnprintf(error->error_msg + len, sizeof(error->error_msg) - len,
                  ", reason: %s, action: %s",
@@ -1382,8 +1544,38 @@ static void i915_capture_gen_state(struct drm_i915_private *dev_priv,
 #endif
        error->reset_count = i915_reset_count(&dev_priv->gpu_error);
        error->suspend_count = dev_priv->suspend_count;
+
+       memcpy(&error->device_info,
+              INTEL_INFO(dev_priv),
+              sizeof(error->device_info));
 }
 
+static int capture(void *data)
+{
+       struct drm_i915_error_state *error = data;
+
+       i915_capture_gen_state(error->i915, error);
+       i915_capture_reg_state(error->i915, error);
+       i915_gem_record_fences(error->i915, error);
+       i915_gem_record_rings(error->i915, error);
+       i915_capture_active_buffers(error->i915, error);
+       i915_capture_pinned_buffers(error->i915, error);
+       i915_gem_capture_guc_log_buffer(error->i915, error);
+
+       do_gettimeofday(&error->time);
+       error->boottime = ktime_to_timeval(ktime_get_boottime());
+       error->uptime =
+               ktime_to_timeval(ktime_sub(ktime_get(),
+                                          error->i915->gt.last_init_time));
+
+       error->overlay = intel_overlay_capture_error_state(error->i915);
+       error->display = intel_display_capture_error_state(error->i915);
+
+       return 0;
+}
+
+#define DAY_AS_SECONDS(x) (24 * 60 * 60 * (x))
+
 /**
  * i915_capture_error_state - capture an error record for later analysis
  * @dev: drm device
@@ -1401,6 +1593,9 @@ void i915_capture_error_state(struct drm_i915_private *dev_priv,
        struct drm_i915_error_state *error;
        unsigned long flags;
 
+       if (!i915.error_capture)
+               return;
+
        if (READ_ONCE(dev_priv->gpu_error.first_error))
                return;
 
@@ -1412,17 +1607,9 @@ void i915_capture_error_state(struct drm_i915_private *dev_priv,
        }
 
        kref_init(&error->ref);
+       error->i915 = dev_priv;
 
-       i915_capture_gen_state(dev_priv, error);
-       i915_capture_reg_state(dev_priv, error);
-       i915_gem_capture_buffers(dev_priv, error);
-       i915_gem_record_fences(dev_priv, error);
-       i915_gem_record_rings(dev_priv, error);
-
-       do_gettimeofday(&error->time);
-
-       error->overlay = intel_overlay_capture_error_state(dev_priv);
-       error->display = intel_display_capture_error_state(dev_priv);
+       stop_machine(capture, error, NULL);
 
        i915_error_capture_msg(dev_priv, error, engine_mask, error_msg);
        DRM_INFO("%s\n", error->error_msg);
@@ -1441,7 +1628,8 @@ void i915_capture_error_state(struct drm_i915_private *dev_priv,
                return;
        }
 
-       if (!warned) {
+       if (!warned &&
+           ktime_get_real_seconds() - DRIVER_TIMESTAMP < DAY_AS_SECONDS(180)) {
                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");
@@ -1462,7 +1650,6 @@ void i915_error_state_get(struct drm_device *dev,
        if (error_priv->error)
                kref_get(&error_priv->error->ref);
        spin_unlock_irq(&dev_priv->gpu_error.lock);
-
 }
 
 void i915_error_state_put(struct i915_error_state_file_priv *error_priv)
@@ -1484,33 +1671,3 @@ void i915_destroy_error_state(struct drm_device *dev)
        if (error)
                kref_put(&error->ref, i915_error_state_free);
 }
-
-const char *i915_cache_level_str(struct drm_i915_private *i915, int type)
-{
-       switch (type) {
-       case I915_CACHE_NONE: return " uncached";
-       case I915_CACHE_LLC: return HAS_LLC(i915) ? " LLC" : " snooped";
-       case I915_CACHE_L3_LLC: return " L3+LLC";
-       case I915_CACHE_WT: return " WT";
-       default: return "";
-       }
-}
-
-/* NB: please notice the memset */
-void i915_get_extra_instdone(struct drm_i915_private *dev_priv,
-                            uint32_t *instdone)
-{
-       memset(instdone, 0, sizeof(*instdone) * I915_NUM_INSTDONE_REG);
-
-       if (IS_GEN2(dev_priv) || IS_GEN3(dev_priv))
-               instdone[0] = I915_READ(GEN2_INSTDONE);
-       else if (IS_GEN4(dev_priv) || IS_GEN5(dev_priv) || IS_GEN6(dev_priv)) {
-               instdone[0] = I915_READ(RING_INSTDONE(RENDER_RING_BASE));
-               instdone[1] = I915_READ(GEN4_INSTDONE1);
-       } else if (INTEL_GEN(dev_priv) >= 7) {
-               instdone[0] = I915_READ(RING_INSTDONE(RENDER_RING_BASE));
-               instdone[1] = I915_READ(GEN7_SC_INSTDONE);
-               instdone[2] = I915_READ(GEN7_SAMPLER_INSTDONE);
-               instdone[3] = I915_READ(GEN7_ROW_INSTDONE);
-       }
-}