Skip to content

Commit de8f0a5

Browse files
vsyrjaladanvet
authored andcommitted
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>
1 parent ddeff6e commit de8f0a5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/gpu/drm/i915/intel_ringbuffer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1494,7 +1494,7 @@ void intel_cleanup_ring_buffer(struct intel_engine_cs *ring)
14941494
return;
14951495

14961496
intel_stop_ring_buffer(ring);
1497-
WARN_ON((I915_READ_MODE(ring) & MODE_IDLE) == 0);
1497+
WARN_ON(!IS_GEN2(ring->dev) && (I915_READ_MODE(ring) & MODE_IDLE) == 0);
14981498

14991499
iounmap(ringbuf->virtual_start);
15001500

0 commit comments

Comments
 (0)