Skip to contentSkip to conversation

drm/i915: don't flood the logs about bdw semaphores

PATCH In review Jani Nikula 2 participants 3 messages Mar 5, 2014

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

PATCH 1/1 drm/i915: don't flood the logs about bdw semaphores

BDW is no longer flagged as preliminary hw, but without i915.preliminary_hw_support module param set the logs are filled with WARNs about it.

Just make semaphores off the BDW per-chip default for now.

---
 drivers/gpu/drm/i915/i915_drv.c |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +4 -6
index ce898aff32a9..fbc546def1d0 100644
@@ -396,15 +396,13 @@ bool i915_semaphore_is_enabled(struct drm_device *dev)
 	if (INTEL_INFO(dev)->gen < 6)
 		return false;
 
-	/* Until we get further testing... */
-	if (IS_GEN8(dev)) {
-		WARN_ON(!i915.preliminary_hw_support);
-		return false;
-	}
-
 	if (i915.semaphores >= 0)
 		return i915.semaphores;
 
+	/* Until we get further testing... */
+	if (IS_GEN8(dev))
+		return false;
+
 #ifdef CONFIG_INTEL_IOMMU
 	/* Enable semaphores on SNB when IO remapping is off */
 	if (INTEL_INFO(dev)->gen == 6 && intel_iommu_gfx_mapped)
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 9 lines · Jani Nikula

BDW is no longer flagged as preliminary hw, but without i915.preliminary_hw_support module param set the logs are filled with WARNs about it.

Just make semaphores off the BDW per-chip default for now.

Acked for -fixes. Maybe also update the comment, it's simply not yet implemented ;-)
-Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
#2 lore raw
In reply to Jani Nikula
Quoted 9 lines · Jani Nikula

BDW is no longer flagged as preliminary hw, but without i915.preliminary_hw_support module param set the logs are filled with WARNs about it.

Just make semaphores off the BDW per-chip default for now.

Queued for -next, thanks for the patch. There's too much bdw fixes material floating around, I think we need to settle them a bit and then backport later.
-Daniel

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