[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <201001090045.33784.rjw@sisk.pl>
Date: Sat, 9 Jan 2010 00:45:33 +0100
From: "Rafael J. Wysocki" <rjw@...k.pl>
To: Eric Anholt <eric@...olt.net>
Cc: Zhenyu Wang <zhenyuw@...ux.intel.com>,
Linus Torvalds <torvalds@...ux-foundation.org>,
LKML <linux-kernel@...r.kernel.org>,
Jesse Barnes <jbarnes@...tuousgeek.org>,
pm list <linux-pm@...ts.linux-foundation.org>,
dri-devel@...ts.sourceforge.net
Subject: [PATCH] DRM / i915: Fix resume regression on MSI Wind U100 w/o KMS
From: Rafael J. Wysocki <rjw@...k.pl>
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@...k.pl>
---
drivers/gpu/drm/i915/i915_drv.c | 53 ++++------------------------------------
1 file changed, 6 insertions(+), 47 deletions(-)
Index: linux-2.6/drivers/gpu/drm/i915/i915_drv.c
===================================================================
--- linux-2.6.orig/drivers/gpu/drm/i915/i915_drv.c
+++ linux-2.6/drivers/gpu/drm/i915/i915_drv.c
@@ -464,6 +418,8 @@ static struct drm_driver driver = {
.lastclose = i915_driver_lastclose,
.preclose = i915_driver_preclose,
.postclose = i915_driver_postclose,
+ .suspend = i915_suspend,
+ .resume = i915_resume,
.device_is_agp = i915_driver_device_is_agp,
.enable_vblank = i915_enable_vblank,
.disable_vblank = i915_disable_vblank,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists