[PATCH 10/12] [v2] drm/i915: don't flood the logs about bdw semaphores

Ben Widawsky
2014-03-21T22:07:01Z

From: Jani Nikula <jani.nikula@intel.com>

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.

v2: Spurious merge hunk leftover in v1 removed

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>
[BDW 3.14 backport]
Cc: stable@vger.kernel.org
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>

Conflicts:
drivers/gpu/drm/i915/i915_drv.c
---
drivers/gpu/drm/i915/i915_drv.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index ec7bb0f..8f16e11 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -476,10 +476,8 @@ bool i915_semaphore_is_enabled(struct drm_device *dev)
return false;

/* Until we get further testing... */
- if (IS_GEN8(dev)) {
- WARN_ON(!i915_preliminary_hw_support);
+ if (IS_GEN8(dev))
return false;
- }

if (i915_semaphores >= 0)
return i915_semaphores;
--
1.9.1