OSDN Git Service

drm/i915: there's no PIPESTAT on HAS_PCH_SPLIT platforms
authorPaulo Zanoni <paulo.r.zanoni@intel.com>
Fri, 22 Mar 2013 17:24:16 +0000 (14:24 -0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Sat, 23 Mar 2013 12:33:50 +0000 (13:33 +0100)
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: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_irq.c

index 5fc178e..3c2b05c 100644 (file)
@@ -1387,8 +1387,9 @@ static void i915_capture_error_state(struct drm_device *dev)
        else if (INTEL_INFO(dev)->gen == 6)
                error->forcewake = I915_READ(FORCEWAKE);
 
-       for_each_pipe(pipe)
-               error->pipestat[pipe] = I915_READ(PIPESTAT(pipe));
+       if (!HAS_PCH_SPLIT(dev))
+               for_each_pipe(pipe)
+                       error->pipestat[pipe] = I915_READ(PIPESTAT(pipe));
 
        if (INTEL_INFO(dev)->gen >= 6) {
                error->error = I915_READ(ERROR_GEN6);