diff options
| author | Ben Widawsky <ben@bwidawsk.net> | 2013-02-25 06:10:01 +0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-03-04 23:48:58 +0400 |
| commit | 211816eccb494b25f96e6bd492292d9d1f6ffda5 (patch) | |
| tree | db0591a2f5a0f105d00d3c053d5ccc8dc56e3f56 | |
| parent | d0d045e8f5164da9f1a06c1214e4f7ec235ca104 (diff) | |
| download | linux-211816eccb494b25f96e6bd492292d9d1f6ffda5.tar.xz | |
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>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |