From e8d320d896be3a5d731b39128e3cc02dacaced67 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 14 Jan 2011 09:46:38 +0000 Subject: [PATCH] --- yaml --- r: 231089 b: refs/heads/master c: 1591192d3a17adeebd03be0ce5888b88bddfaf89 h: refs/heads/master i: 231087: 522a37bfe07b6f783c2451de391cc0000432a027 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3b8eb420385c..1bee2d0b085e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 595dad76a0d213adc3dbe4f463f7887e905082b9 +refs/heads/master: 1591192d3a17adeebd03be0ce5888b88bddfaf89 diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/trunk/drivers/gpu/drm/i915/i915_gem_execbuffer.c index 8db88e34ef7b..dcfdf4151b6d 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/trunk/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -772,7 +772,8 @@ i915_gem_execbuffer_sync_rings(struct drm_i915_gem_object *obj, if (from == NULL || to == from) return 0; - if (INTEL_INFO(obj->base.dev)->gen < 6) + /* XXX gpu semaphores are currently causing hard hangs on SNB mobile */ + if (INTEL_INFO(obj->base.dev)->gen < 6 || IS_MOBILE(obj->base.dev)) return i915_gem_object_wait_rendering(obj, true); idx = intel_ring_sync_index(from, to);