aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2010-01-08 18:45:33 -0500
committerEric Anholt <eric@anholt.net>2010-01-12 17:30:06 -0500
commitd8e292093a3a78a7967757e90abbe64869e4cb7c (patch)
tree891c37871e289cfb5772d71b429a4d322f663780 /drivers
parenta59e385eacd920222756a23c113444fe3063cf81 (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. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org> [anholt: added comment explaining when .suspend/.resume matter] Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 2ffffd7ae09a..66f7bac2ee55 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -464,6 +464,11 @@ 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
468 /* Used in place of i915_pm_ops for non-DRIVER_MODESET */
469 .suspend = i915_suspend,
470 .resume = i915_resume,
471
467 .device_is_agp = i915_driver_device_is_agp, 472 .device_is_agp = i915_driver_device_is_agp,
468 .enable_vblank = i915_enable_vblank, 473 .enable_vblank = i915_enable_vblank,
469 .disable_vblank = i915_disable_vblank, 474 .disable_vblank = i915_disable_vblank,