From: Ben Widawsky <ben@bwidawsk.net>
Date: Mon, 25 Feb 2013 02:10:01 +0000 (-0800)
Subject: drm/i915: exclude CCID for platforms without it
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=211816eccb494b25f96e6bd492292d9d1f6ffda5;p=openwrt%2Fstaging%2Fblogic.git

drm/i915: exclude CCID for platforms without it

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 97b65f079b30..12561f2f7fd7 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1321,7 +1321,8 @@ static void i915_capture_error_state(struct drm_device *dev)
 	kref_init(&error->ref);
 	error->eir = I915_READ(EIR);
 	error->pgtbl_er = I915_READ(PGTBL_ER);
-	error->ccid = I915_READ(CCID);
+	if (HAS_HW_CONTEXTS(dev))
+		error->ccid = I915_READ(CCID);
 
 	if (HAS_PCH_SPLIT(dev))
 		error->ier = I915_READ(DEIER) | I915_READ(GTIER);