summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2013-11-04 19:45:44 -0800
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-11-08 18:10:03 +0100
commite64c4a1b8a1fbf56cbeed794816e6587719fab5c (patch)
treea7e0ee7ffba41305e5413e61814cdf1e57f9c360 /drivers/gpu
parent6edee7f3e7daab105b33148b49c74a8f881d172e (diff)
downloadlinux-e64c4a1b8a1fbf56cbeed794816e6587719fab5c.tar.gz
linux-e64c4a1b8a1fbf56cbeed794816e6587719fab5c.tar.bz2
linux-e64c4a1b8a1fbf56cbeed794816e6587719fab5c.zip
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')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c6
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)
if (INTEL_INFO(dev)->gen < 6)
return 0;
+ /* Until we get further testing... */
+ if (IS_GEN8(dev)) {
+ WARN_ON(!i915_preliminary_hw_support);
+ return 0;
+ }
+
if (i915_semaphores >= 0)
return i915_semaphores;