Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Browse source

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

...

This commit is contained in:

Linus Torvalds 2012-03-29 11:24:43 -07:00

parent b5174fa3a7 3fa016a0b5

commit 0a03726ca9

3 changed files with 18 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

7

drivers/gpu/drm/i915/i915_drv.c

View file

2

drivers/gpu/drm/i915/intel_drv.h

View file

10

drivers/gpu/drm/i915/intel_fb.c

View file