aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/i915_gem_execbuffer.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 1c3b76a8a6fb..d461ad5f9290 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -744,8 +744,7 @@ i915_gem_execbuffer_sync_rings(struct drm_i915_gem_object *obj,
744 if (from == NULL || to == from) 744 if (from == NULL || to == from)
745 return 0; 745 return 0;
746 746
747 /* XXX gpu semaphores are currently causing hard hangs on SNB mobile */ 747 if (INTEL_INFO(obj->base.dev)->gen < 6)
748 if (INTEL_INFO(obj->base.dev)->gen < 6 || IS_MOBILE(obj->base.dev))
749 return i915_gem_object_wait_rendering(obj); 748 return i915_gem_object_wait_rendering(obj);
750 749
751 idx = intel_ring_sync_index(from, to); 750 idx = intel_ring_sync_index(from, to);