aboutsummaryrefslogtreecommitdiffstats
path: root/arch/score
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2010-01-09 00:45:33 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-08 17:19:41 -0800
commit50f411e34d623efbf4e4b4b0c1a4a20e04c5cc9e (patch)
treeeb9d397718202247d975180909656bc13ab7ef48 /arch/score
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband (diff)
downloadlinux-dev-50f411e34d623efbf4e4b4b0c1a4a20e04c5cc9e.tar.xz
linux-dev-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 <rjw@sisk.pl> Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/score')
0 files changed, 0 insertions, 0 deletions