From: Ville Syrjälä Date: Wed, 28 May 2014 16:12:13 +0000 (+0300) Subject: drm/i915: Don't WARN about ring idle bit on gen2 X-Git-Tag: v3.16-rc1~35^2~10^2~10 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=de8f0a5016c8a0665ec2a55ed0187bad886c7dab;p=linux.git 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ä Reviewed-by: Chris Wilson Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 3379722d0e6d..279488addf3f 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);