diff options
| author | Andy Lutomirski | 2011-05-13 12:14:54 -0400 |
|---|---|---|
| committer | Linus Torvalds | 2011-05-13 12:22:51 -0700 |
| commit | 087fbc9962e10a65fb0b542ecfc116ebf6cf1735 (patch) | |
| tree | c6cedad81ecb0bbc87eab629349cd2dcad7bba82 /fs/nfs/nfs4filelayout.h | |
| parent | 26cf46be954a2dd391d32eeaf7d07c3a953dcc5a (diff) | |
drm/i915: Revert i915.semaphore=1 default from i915 merge
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 a1656b9090f7 ("drm/i915: Disable GPU
semaphores by default") in 2.6.38 but were then re-enabled (by mistake?)
by the merge 47ae63e0c2e5 ("Merge branch 'drm-intel-fixes' into
drm-intel-next").
(It's worth noting that the offending change is i915_drv.c, which was
not marked as a conflict - although a 'git show --cc' on the merge does
show that neither parent had it set to 1)
Signed-off-by: Andy Lutomirski <luto@mit.edu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/nfs/nfs4filelayout.h')
0 files changed, 0 insertions, 0 deletions