diff options
| author | Rafael J. Wysocki <[email protected]> | 2010-01-08 23:45:33 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2010-01-09 01:19:41 +0000 |
| commit | 50f411e34d623efbf4e4b4b0c1a4a20e04c5cc9e (patch) | |
| tree | eb9d397718202247d975180909656bc13ab7ef48 /lib/dma-debug.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff) | |
| download | kernel-50f411e34d623efbf4e4b4b0c1a4a20e04c5cc9e.tar.gz kernel-50f411e34d623efbf4e4b4b0c1a4a20e04c5cc9e.zip | |
DRM / i915: Fix resume regression on MSI Wind U100 w/o KMS
Commit cbda12d77ea590082edb6d30bd342a67ebc459e0 (drm/i915: implement
new pm ops for i915), among other things, removed the .suspend and
.resume pointers from the struct drm_driver object in i915_drv.c,
which broke resume without KMS on my MSI Wind U100.
Fix this by reverting that part of commit cbda12d77ea59.
[ The DRM layer will not use the class-specific suspend/resume functions
if the driver is marked MODESET-aware, and conversely it will not
register the PCI device if the drievr isn't so marked, so you always
end up with _either_ the drm-class suspend/resume _or_ the PCI layer
PM functionality, never both. - Linus ]
Signed-off-by: Rafael J. Wysocki <[email protected]>
Acked-by: Jesse Barnes <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'lib/dma-debug.c')
0 files changed, 0 insertions, 0 deletions