diff options
author | Ben Widawsky <ben@bwidawsk.net> | 2013-11-04 22:45:44 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-08 12:10:03 -0500 |
commit | e64c4a1b8a1fbf56cbeed794816e6587719fab5c (patch) | |
tree | a7e0ee7ffba41305e5413e61814cdf1e57f9c360 /drivers/gpu/drm/i915 | |
parent | 6edee7f3e7daab105b33148b49c74a8f881d172e (diff) |
drm/i915/bdw: Disable semaphores
We've done insufficient testing on them thus far, so keep them disabled
until we do test.
v2: Use WARN when not enabling preliminary HW support as this should
only be disabled for that case.
v3: Rip out the now useless (and really noisy) DRM_INFO output.
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Jesse Barnes <jbarnes@virtuosugeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index a78e7798ec6b..bbea429ec4b5 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
@@ -478,6 +478,12 @@ bool i915_semaphore_is_enabled(struct drm_device *dev) | |||
478 | if (INTEL_INFO(dev)->gen < 6) | 478 | if (INTEL_INFO(dev)->gen < 6) |
479 | return 0; | 479 | return 0; |
480 | 480 | ||
481 | /* Until we get further testing... */ | ||
482 | if (IS_GEN8(dev)) { | ||
483 | WARN_ON(!i915_preliminary_hw_support); | ||
484 | return 0; | ||
485 | } | ||
486 | |||
481 | if (i915_semaphores >= 0) | 487 | if (i915_semaphores >= 0) |
482 | return i915_semaphores; | 488 | return i915_semaphores; |
483 | 489 | ||