summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Widawsky <benjamin.widawsky@intel.com>2014-03-14 23:01:58 -0700
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-03-18 16:31:36 +0100
commitae89f44d13a36192cc19c1de04aa41ab0b3624cc (patch)
tree8a6fb1662439ae7072df6d184f2d089f2753800a
parent849e39f5d7e52eb44d37bbd5ce695f7cdcbe923c (diff)
downloadop-kernel-dev-ae89f44d13a36192cc19c1de04aa41ab0b3624cc.zip
op-kernel-dev-ae89f44d13a36192cc19c1de04aa41ab0b3624cc.tar.gz
drm/i915: Actually capture PP_DIR_BASE on error
I have been seeing this for a long time, but ignored it because it's typically not terribly important. Recently, I really needed this info, and it was garbage. Proof that I should have fixed it sooner. Originally wrong from: commit 6c7a01ec3743a5a6ce9e53a69d7a6c2d8c715eb1 Author: Ben Widawsky <benjamin.widawsky@intel.com> Date: Thu Jan 30 00:19:40 2014 -0800 drm/i915: Capture PPGTT info on error capture Cc: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/i915_gpu_error.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 144a5e2..baf1ca6 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -850,10 +850,12 @@ static void i915_record_ring_state(struct drm_device *dev,
}
break;
case 7:
- ering->vm_info.pp_dir_base = RING_PP_DIR_BASE(ring);
+ ering->vm_info.pp_dir_base =
+ I915_READ(RING_PP_DIR_BASE(ring));
break;
case 6:
- ering->vm_info.pp_dir_base = RING_PP_DIR_BASE_READ(ring);
+ ering->vm_info.pp_dir_base =
+ I915_READ(RING_PP_DIR_BASE_READ(ring));
break;
}
}
OpenPOWER on IntegriCloud