Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
drm/i915: Revert i915.semaphore=1 default from 47ae63e
My Q67 / i7-2600 box has rev09 Sandy Bridge graphics. It hangs instantly when GNOME loads and it hangs so hard the reset button doesn't work. Setting i915.semaphore=0 fixes it. Semaphores were disabled in a1656b9 in 2.6.38 and were re-enabled by commit 47ae63e Merge: c59a333 467cffb Author: Chris Wilson <[email protected]> Date: Mon Mar 7 12:32:44 2011 +0000 Merge branch 'drm-intel-fixes' into drm-intel-next Apply the trivial conflicting regression fixes, but keep GPU semaphores enabled. Conflicts: drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem_execbuffer.c (It's worth noting that the offending change is i915_drv.c, which is not a conflict.) Signed-off-by: Andy Lutomirski <[email protected]> Acked-by: Keith Packard <[email protected]> Signed-off-by: Dave Airlie <[email protected]>