diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 20:24:43 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 20:24:43 +0200 |
| commit | 0a03726ca982129b1e054f0e8c34ca7eea348acd (patch) | |
| tree | dbb553fd3f7c6300aa2c4fc09f4e6c3262cec8b3 /fs/proc | |
| parent | Merge tag 'mmc-merge-for-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | drm/i915: suspend fbdev device around suspend/hibernate (diff) | |
| download | linux-0a03726ca982129b1e054f0e8c34ca7eea348acd.tar.xz linux-0a03726ca982129b1e054f0e8c34ca7eea348acd.zip | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull the intel i915 hibernation memory corruption fix from Dave Airlie:
"I tracked down the misc memory corruption after i915 hibernate to the
blinking fbcon cursor, and realised the i915 driver wasn't doing the
fbdev suspend/resume calls at all. nouveau and radeon have done these
calls for a long time.
This has been fairly well tested and is definitely the main culprit in
hibernate not working."
Yay.
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/i915: suspend fbdev device around suspend/hibernate
Diffstat (limited to 'fs/proc')
0 files changed, 0 insertions, 0 deletions