Skip to contentSkip to conversation

drm/i915: Don't WARN about ring idle bit on gen2

PATCH Applied [email protected] 3 participants 3 messages May 28, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Don't WARN about ring idle bit on gen2

From: Ville Syrjälä <[email protected]>

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.

---
 drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +1 -1
index 3379722..279488a 100644
@@ -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);
 
Signature · 6 lines
1.8.5.5

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · On Wed, May 28, 2014 at 07:12:13PM +0300, [email protected] wrote:

From: Ville Syrjälä <[email protected]>

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.

My mistake, forgot about that warning when fixing the earlier call to idle,

-Chris

Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
#2 lore raw
Quoted 6 lines · Chris Wilson
Quoted 5 lines · On Wed, May 28, 2014 at 07:12:13PM +0300, [email protected] wrote:

From: Ville Syrjälä <[email protected]>

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.

Quoted 6 lines
Quoted 1 line

My mistake, forgot about that warning when fixing the earlier call to idle,

Queued for -next, thanks for the patch.
-Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch