Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8e29209 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Eric Anholt
Browse files

drm/i915: Fix resume regression on MSI Wind U100 w/o KMS 



Commit cbda12d7 (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 cbda12d7.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
[anholt: added comment explaining when .suspend/.resume matter]
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent a59e385e

drivers/gpu/drm/i915/i915_drv.c

+5 −0
Original line number Diff line number Diff line
@@ -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,