Commit 4f3308b9 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter

drm/i915: there's no PIPESTAT on HAS_PCH_SPLIT platforms

So don't read it when capturing the error state. This solves
"unclaimed register" messages on Haswell when we have a GPU hang.

V2: Check for HAS_PCH_SPLIT instead of Gen5+ because VLV still has
this register.
Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 80ca378b
...@@ -1387,8 +1387,9 @@ static void i915_capture_error_state(struct drm_device *dev) ...@@ -1387,8 +1387,9 @@ static void i915_capture_error_state(struct drm_device *dev)
else if (INTEL_INFO(dev)->gen == 6) else if (INTEL_INFO(dev)->gen == 6)
error->forcewake = I915_READ(FORCEWAKE); error->forcewake = I915_READ(FORCEWAKE);
for_each_pipe(pipe) if (!HAS_PCH_SPLIT(dev))
error->pipestat[pipe] = I915_READ(PIPESTAT(pipe)); for_each_pipe(pipe)
error->pipestat[pipe] = I915_READ(PIPESTAT(pipe));
if (INTEL_INFO(dev)->gen >= 6) { if (INTEL_INFO(dev)->gen >= 6) {
error->error = I915_READ(ERROR_GEN6); error->error = I915_READ(ERROR_GEN6);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment