diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2010-01-08 18:45:33 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-08 20:19:41 -0500 |
| commit | 50f411e34d623efbf4e4b4b0c1a4a20e04c5cc9e (patch) | |
| tree | eb9d397718202247d975180909656bc13ab7ef48 /drivers/gpu | |
| parent | 3c8ad49b015eb115fbd6982f56d530f53cf57f84 (diff) | |
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 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 2ffffd7ae09a..be631cc3e4dc 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
| @@ -464,6 +464,8 @@ static struct drm_driver driver = { | |||
| 464 | .lastclose = i915_driver_lastclose, | 464 | .lastclose = i915_driver_lastclose, |
| 465 | .preclose = i915_driver_preclose, | 465 | .preclose = i915_driver_preclose, |
| 466 | .postclose = i915_driver_postclose, | 466 | .postclose = i915_driver_postclose, |
| 467 | .suspend = i915_suspend, | ||
| 468 | .resume = i915_resume, | ||
| 467 | .device_is_agp = i915_driver_device_is_agp, | 469 | .device_is_agp = i915_driver_device_is_agp, |
| 468 | .enable_vblank = i915_enable_vblank, | 470 | .enable_vblank = i915_enable_vblank, |
| 469 | .disable_vblank = i915_disable_vblank, | 471 | .disable_vblank = i915_disable_vblank, |