diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2014-05-28 19:12:13 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-06-05 08:52:41 +0200 |
| commit | de8f0a5016c8a0665ec2a55ed0187bad886c7dab (patch) | |
| tree | e20471ec47eb937f8f1e0a230e5eab30f69fcedc /drivers/gpu/drm/i915/intel_ringbuffer.c | |
| parent | ddeff6ee423178246a16875cae0bf033ce1e8455 (diff) | |
| download | op-kernel-dev-de8f0a5016c8a0665ec2a55ed0187bad886c7dab.zip op-kernel-dev-de8f0a5016c8a0665ec2a55ed0187bad886c7dab.tar.gz | |
drm/i915: Don't WARN about ring idle bit on gen2
Gen2 doesn't have the ring idle/stop bits in the SCPD/MI_MODE register,
so don't go spewing warnings about the state of those bits.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 3379722..279488a 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -1494,7 +1494,7 @@ void intel_cleanup_ring_buffer(struct intel_engine_cs *ring) return; intel_stop_ring_buffer(ring); - WARN_ON((I915_READ_MODE(ring) & MODE_IDLE) == 0); + WARN_ON(!IS_GEN2(ring->dev) && (I915_READ_MODE(ring) & MODE_IDLE) == 0); iounmap(ringbuf->virtual_start); |
