diff options
| author | Rafael J. Wysocki <[email protected]> | 2010-02-18 22:06:27 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2010-02-22 16:47:14 +0000 |
| commit | 61caf87cb5c2a198966018343a6ce4c5ab6cf8df (patch) | |
| tree | 4fa1ab6a366627a8d3113b4be62f9c251307a00a /lib/debugobjects.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| download | kernel-61caf87cb5c2a198966018343a6ce4c5ab6cf8df.tar.gz kernel-61caf87cb5c2a198966018343a6ce4c5ab6cf8df.zip | |
i915 / PM: Fix hibernate regression caused by suspend/resume splitting
Commit 84b79f8d2882b0a84330c04839ed4d3cefd2ff77 (drm/i915: Fix crash
while aborting hibernation) attempted to fix a regression introduced
by commit cbda12d77ea590082edb6d30bd342a67ebc459e0 (drm/i915:
implement new pm ops for i915), but it went too far trying to split
the freeze/suspend and resume/thaw parts of the code. As a result,
it introduced another regression, which only is visible on some systems.
Fix the problem by merging i915_drm_suspend() with
i915_drm_freeze() and moving some code from i915_resume()
into i915_drm_thaw(), so that intel_opregion_free() and
intel_opregion_init() are also executed in the freeze and thaw code
paths, respectively.
Signed-off-by: Rafael J. Wysocki <[email protected]>
Reported-and-tested-by: Pedro Ribeiro <[email protected]>
Tested-by: Tino Keitel <[email protected]>
Acked-by: Eric Anholt <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'lib/debugobjects.c')
0 files changed, 0 insertions, 0 deletions