public inbox for linux-pm@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] DRM / i915: Fix resume regression on MSI Wind U100 w/o KMS
@ 2010-01-08 23:45 Rafael J. Wysocki
  2010-01-09  0:01 ` Linus Torvalds
                   ` (3 more replies)
  0 siblings, 4 replies; 28+ messages in thread
From: Rafael J. Wysocki @ 2010-01-08 23:45 UTC (permalink / raw)
  To: Eric Anholt
  Cc: LKML, Jesse Barnes, Zhenyu Wang, pm list, dri-devel,
	Linus Torvalds

From: Rafael J. Wysocki <rjw@sisk.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@sisk.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,

^ permalink raw reply	[flat|nested] 28+ messages in thread

end of thread, other threads:[~2010-01-12 22:48 UTC | newest]

Thread overview: 28+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-08 23:45 [PATCH] DRM / i915: Fix resume regression on MSI Wind U100 w/o KMS Rafael J. Wysocki
2010-01-09  0:01 ` Linus Torvalds
     [not found] ` <alpine.LFD.2.00.1001081548320.7821@localhost.localdomain>
2010-01-09  0:06   ` Jesse Barnes
     [not found]   ` <20100108160659.65ac0605@jbarnes-piketon>
2010-01-09  0:21     ` Jesse Barnes
     [not found]     ` <20100108162119.55538b7e@jbarnes-piketon>
2010-01-09  0:43       ` Rafael J. Wysocki
2010-01-09  0:21   ` Rafael J. Wysocki
2010-01-09  0:32   ` Jesse Barnes
     [not found]   ` <20100108163217.341da699@jbarnes-piketon>
2010-01-09  0:46     ` Rafael J. Wysocki
     [not found]     ` <201001090146.17793.rjw@sisk.pl>
2010-01-09  0:50       ` Linus Torvalds
     [not found]       ` <alpine.LFD.2.00.1001081648490.7821@localhost.localdomain>
2010-01-09  1:13         ` Jesse Barnes
     [not found]         ` <20100108171311.128c43d0@jbarnes-piketon>
2010-01-09 13:35           ` [PATCH] i915: Always register as a PCI driver (was: Re: [PATCH] DRM / i915: Fix resume regression on MSI Wind U100 w/o KMS) Rafael J. Wysocki
     [not found]           ` <201001091435.56157.rjw@sisk.pl>
2010-01-09 21:41             ` Dave Airlie
     [not found]             ` <21d7e9971001091341j313e6274vd883c0d5301b2586@mail.gmail.com>
2010-01-09 22:07               ` Rafael J. Wysocki
2010-01-09  2:15   ` [PATCH] DRM / i915: Fix resume regression on MSI Wind U100 w/o KMS Dave Airlie
     [not found]   ` <alpine.DEB.2.00.1001090214220.21286@skynet.skynet.ie>
2010-01-09  2:50     ` Jesse Barnes
     [not found]     ` <20100108185041.7aae6c01@jbarnes-piketon>
2010-01-09 12:01       ` Jerome Glisse
     [not found]       ` <20100109120141.GA4319@localhost.localdomain>
2010-01-09 18:17         ` Linus Torvalds
2010-01-09 21:32           ` Dave Airlie
     [not found]           ` <21d7e9971001091332v23ac0e28m1b1890cd667aacb8@mail.gmail.com>
2010-01-11 16:38             ` Jesse Barnes
     [not found]             ` <20100111083825.4c2bb7b3@jbarnes-piketon>
2010-01-11 20:12               ` Dave Airlie
     [not found]               ` <21d7e9971001111212h1ded5292l94d514c6f5a47cd4@mail.gmail.com>
2010-01-11 20:22                 ` Jesse Barnes
2010-01-11 21:04                 ` Rafael J. Wysocki
     [not found]                 ` <201001112204.36724.rjw@sisk.pl>
2010-01-11 21:43                   ` Julien Cristau
     [not found]                   ` <20100111214355.GA11456@radis.liafa.jussieu.fr>
2010-01-11 22:22                     ` Rafael J. Wysocki
     [not found]                     ` <201001112322.14152.rjw@sisk.pl>
2010-01-11 23:05                       ` Dave Airlie
     [not found]                       ` <21d7e9971001111505ydf12687nbcb752e38efd493c@mail.gmail.com>
2010-01-11 23:16                         ` Rafael J. Wysocki
2010-01-12 22:33 ` Eric Anholt
     [not found] ` <878wc3j6mm.fsf@pollan.anholt.net>
2010-01-12 22:48   ` Rafael J. Wysocki

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox