diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2010-01-09 00:45:33 +0100 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-01-12 14:30:06 -0800 |
| commit | d8e292093a3a78a7967757e90abbe64869e4cb7c (patch) | |
| tree | 891c37871e289cfb5772d71b429a4d322f663780 | |
| parent | a59e385eacd920222756a23c113444fe3063cf81 (diff) | |
| download | linux-d8e292093a3a78a7967757e90abbe64869e4cb7c.tar.gz linux-d8e292093a3a78a7967757e90abbe64869e4cb7c.tar.bz2 linux-d8e292093a3a78a7967757e90abbe64869e4cb7c.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.
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>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 5 |
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 = { .lastclose = i915_driver_lastclose, .preclose = i915_driver_preclose, .postclose = i915_driver_postclose, + + /* Used in place of i915_pm_ops for non-DRIVER_MODESET */ + .suspend = i915_suspend, + .resume = i915_resume, + .device_is_agp = i915_driver_device_is_agp, .enable_vblank = i915_enable_vblank, .disable_vblank = i915_disable_vblank, |