diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-03-08 07:18:35 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-03-08 07:18:35 +1000 |
| commit | 862060414b7f3e6b1c20cc3cf1f2014328069f0b (patch) | |
| tree | aef09e10ff5087563d94dc8bdeeb67a2ad7b2f26 /drivers/gpu/drm/i915/i915_gem_execbuffer.c | |
| parent | 6f70a4c3d19e8e8e1047a4dbf0ca910fed39f619 (diff) | |
| parent | 467cffba85791cdfce38c124d75bd578f4bb8625 (diff) | |
| download | op-kernel-dev-862060414b7f3e6b1c20cc3cf1f2014328069f0b.zip op-kernel-dev-862060414b7f3e6b1c20cc3cf1f2014328069f0b.tar.gz | |
Merge remote branch 'ickle/drm-intel-fixes' into drm-fixes
* ickle/drm-intel-fixes:
drm/i915: Rebind the buffer if its alignment constraints changes with tiling
drm/i915: Disable GPU semaphores by default
drm/i915: Do not overflow the MMADDR write FIFO
Revert "drm/i915: fix corruptions on i8xx due to relaxed fencing"
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_execbuffer.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index d2f445e..50ab161 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -772,8 +772,8 @@ i915_gem_execbuffer_sync_rings(struct drm_i915_gem_object *obj, if (from == NULL || to == from) return 0; - /* XXX gpu semaphores are currently causing hard hangs on SNB mobile */ - if (INTEL_INFO(obj->base.dev)->gen < 6 || IS_MOBILE(obj->base.dev)) + /* XXX gpu semaphores are implicated in various hard hangs on SNB */ + if (INTEL_INFO(obj->base.dev)->gen < 6 || !i915_semaphores) return i915_gem_object_wait_rendering(obj, true); idx = intel_ring_sync_index(from, to); |
