diff options
| author | Rafael J. Wysocki <[email protected]> | 2010-02-07 20:48:24 +0000 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2010-02-11 01:34:33 +0000 |
| commit | 84b79f8d2882b0a84330c04839ed4d3cefd2ff77 (patch) | |
| tree | 087d75e21a0550bc10f109635b93bf02fa220bfb /scripts/mod/file2alias.c | |
| parent | drm/i915: Correctly return -ENOMEM on allocation failure in cmdbuf ioctls. (diff) | |
| download | kernel-84b79f8d2882b0a84330c04839ed4d3cefd2ff77.tar.gz kernel-84b79f8d2882b0a84330c04839ed4d3cefd2ff77.zip | |
drm/i915: Fix crash while aborting hibernation
Commit cbda12d77ea590082edb6d30bd342a67ebc459e0 (drm/i915: implement
new pm ops for i915) introduced the problem that if s2disk hibernation
is aborted, the system will crash, because i915_pm_freeze() does
nothing, while it should at least reverse some operations carried out
by i915_suspend().
Fix this issue by splitting the i915 suspend into a freeze part a
suspend part, where the latter is not executed before creating a
hibernation image, and the i915 resume into a "low-level" resume part
and a thaw part, where the former is not executed after the image has
been created.
Signed-off-by: Rafael J. Wysocki <[email protected]>
Tested-by: Alan Jenkins <[email protected]>
Signed-off-by: Eric Anholt <[email protected]>
Diffstat (limited to 'scripts/mod/file2alias.c')
0 files changed, 0 insertions, 0 deletions