From 8a9538adf74fd46cc4eb3fa8e8a1cd8e20dfed56 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Fri, 17 Oct 2008 00:44:42 -0700
Subject: [PATCH] --- yaml --- r: 117235 b: refs/heads/master c:
 d1ed629f44b3a4108d5c445971535f05f441fce7 h: refs/heads/master i:   117233:
 09a67515ae19d99d8590e01b866534d5f58d91d2   117231:
 ff2a9ce265be5f85d5b79c4dc73098b581e89710 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_dma.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8706e3f8f920..18852eaeccf9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 863842736fb4571b22e0f7f4696bf13eeec57166
+refs/heads/master: d1ed629f44b3a4108d5c445971535f05f441fce7
diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c
index db34780edbb2..01de536e0211 100644
--- a/trunk/drivers/gpu/drm/i915/i915_dma.c
+++ b/trunk/drivers/gpu/drm/i915/i915_dma.c
@@ -844,8 +844,11 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 	 * correctly in testing on 945G.
 	 * This may be a side effect of MSI having been made available for PEG
 	 * and the registers being closely associated.
+	 *
+	 * According to chipset errata, on the 965GM, MSI interrupts may
+	 * be lost or delayed
 	 */
-	if (!IS_I945G(dev) && !IS_I945GM(dev))
+	if (!IS_I945G(dev) && !IS_I945GM(dev) && !IS_I965GM(dev))
 		if (pci_enable_msi(dev->pdev))
 			DRM_ERROR("failed to enable MSI\n");