[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <200803261628.12336.jesse.barnes@intel.com>
Date: Wed, 26 Mar 2008 16:28:12 -0700
From: Jesse Barnes <jesse.barnes@...el.com>
To: lkml <linux-kernel@...r.kernel.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>,
Dave Airlie <airlied@...ux.ie>
Subject: [PATCH] don't suspend/resume 8xx chips
Recent testing has turned up some bugs in the new Intel suspend/resume code
for old, 8xx chipsets. So for 2.6.25 it probably makes sense to apply this
patch, which should prevent the new code from getting called on those
chipsets. We should have this fixed soon, but not in time for 2.6.25
unfortunately. Note that this patch (along with the suspend/resume code in
general) could use more testing.
Signed-off-by: Jesse Barnes <jesse.barnes@...el.com>
diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index e9d6663..6964a28 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -762,6 +762,11 @@ int i915_driver_load(struct drm_device *dev, unsigned
long
unsigned long base, size;
int ret = 0, mmio_bar = IS_I9XX(dev) ? 0 : 1;
+ if (!IS_I9XX(dev)) {
+ dev->driver->suspend = NULL;
+ dev->driver->resume = NULL;
+ }
+
/* i915 has 4 more counters */
dev->counters += 4;
dev->types[6] = _DRM_STAT_IRQ;
--
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