drm/i915: don't flood the logs about bdw semaphores
authorJani Nikula <jani.nikula@intel.com>
Wed, 5 Mar 2014 12:17:28 +0000 (14:17 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 5 Mar 2014 20:30:29 +0000 (21:30 +0100)
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.

CC: Ben Widawsky <ben@bwidawsk.net>
Reported-by: Sebastien Dufour <sebastien.dufour@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_drv.c

index a50292c0423fb97b5095fa75f6a03db09eb59d4d..6ac91fcdb4f8b7f62d7d2dfbd87d46ef6de51a34 100644 (file)
@@ -403,15 +403,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)