projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d0d045e)
drm/i915: exclude CCID for platforms without it
authorBen Widawsky <ben@bwidawsk.net>
Mon, 25 Feb 2013 02:10:01 +0000 (18:10 -0800)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 4 Mar 2013 19:48:58 +0000 (20:48 +0100)
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>
drivers/gpu/drm/i915/i915_irq.c patch | blob | blame | history

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 97b65f079b307a732478be4f2858e4c57712eaaf..12561f2f7fd70c55ded34116d525c111f5f606b1 100644 (file)
--- 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);