Merge tag 'topic/drm-misc-2016-02-12' into drm-intel-next-queued

[cascardo/linux.git] / drivers / gpu / drm / i915 / i915_gpu_error.c

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 06ca408..978c026 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -365,6 +365,10 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
        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 Subsystem: %04x:%04x\n",
+                  dev->pdev->subsystem_vendor,
+                  dev->pdev->subsystem_device);
        err_printf(m, "IOMMU enabled?: %d\n", error->iommu);
 
        if (HAS_CSR(dev)) {
@@ -1050,7 +1054,7 @@ static void i915_gem_record_rings(struct drm_device *dev,
                        if (request)
                                rbuf = request->ctx->engine[ring->id].ringbuf;
                        else
-                               rbuf = ring->default_context->engine[ring->id].ringbuf;
+                               rbuf = dev_priv->kernel_context->engine[ring->id].ringbuf;
                } else
                        rbuf = ring->buffer;