From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Eric Anholt <eric@anholt.net>
Cc: Zhenyu Wang <zhenyuw@linux.intel.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
LKML <linux-kernel@vger.kernel.org>,
Jesse Barnes <jbarnes@virtuousgeek.org>,
pm list <linux-pm@lists.linux-foundation.org>,
dri-devel@lists.sourceforge.net
Subject: [PATCH] DRM / i915: Fix resume regression on MSI Wind U100 w/o KMS
Date: Sat, 9 Jan 2010 00:45:33 +0100 [thread overview]
Message-ID: <201001090045.33784.rjw@sisk.pl> (raw)
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,
next reply other threads:[~2010-01-08 23:45 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-08 23:45 Rafael J. Wysocki [this message]
2010-01-09 0:01 ` [PATCH] DRM / i915: Fix resume regression on MSI Wind U100 w/o KMS Linus Torvalds
2010-01-09 0:06 ` Jesse Barnes
2010-01-09 0:21 ` Jesse Barnes
2010-01-09 0:43 ` Rafael J. Wysocki
2010-01-09 0:21 ` Rafael J. Wysocki
2010-01-09 0:32 ` Jesse Barnes
2010-01-09 0:46 ` Rafael J. Wysocki
2010-01-09 0:50 ` Linus Torvalds
2010-01-09 1:13 ` Jesse Barnes
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
2010-01-09 21:41 ` Dave Airlie
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
2010-01-09 2:50 ` Jesse Barnes
2010-01-09 12:01 ` Jerome Glisse
2010-01-09 18:17 ` Linus Torvalds
2010-01-09 21:32 ` Dave Airlie
2010-01-11 16:38 ` Jesse Barnes
2010-01-11 20:12 ` Dave Airlie
2010-01-11 20:22 ` Jesse Barnes
2010-01-11 21:04 ` Rafael J. Wysocki
2010-01-11 21:43 ` Julien Cristau
2010-01-11 22:22 ` Rafael J. Wysocki
2010-01-11 23:05 ` Dave Airlie
2010-01-11 23:16 ` Rafael J. Wysocki
2010-01-12 22:33 ` Eric Anholt
2010-01-12 22:48 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201001090045.33784.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=dri-devel@lists.sourceforge.net \
--cc=eric@anholt.net \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@lists.linux-foundation.org \
--cc=torvalds@linux-foundation.org \
--cc=zhenyuw@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).