From 32c5c45d796c02b644cb2ab7af8babb0421919f4 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 20 Aug 2010 11:26:59 +0100
Subject: [PATCH] --- yaml --- r: 217935 b: refs/heads/master c:
 015b9c8ce50e5bfb7ea78613dcad4b30d1a0d9da h: refs/heads/master i:   217933:
 ff7eae364128cf9049db9146a4d8b00072f7e76b   217931:
 78f56234cefce930ba9c2d95d909bd15f358202c   217927:
 1eb27e11eeec61d1048979663a62ade695d44b1b   217919:
 699dbe4b56b12a92d98d5bc0afbc5edbe3fd21e9 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_dma.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 7917b8ab3a3d..9c3ca42eae20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bd3c9329973a93fa3ef5e9840f2fd6fa2889e3f
+refs/heads/master: 015b9c8ce50e5bfb7ea78613dcad4b30d1a0d9da
diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c
index 2dae3be9ebef..315326d5dc22 100644
--- a/trunk/drivers/gpu/drm/i915/i915_dma.c
+++ b/trunk/drivers/gpu/drm/i915/i915_dma.c
@@ -1444,12 +1444,6 @@ static int i915_load_modeset_init(struct drm_device *dev,
 	/* FIXME: do pre/post-mode set stuff in core KMS code */
 	dev->vblank_disable_allowed = 1;
 
-	/*
-	 * Initialize the hardware status page IRQ location.
-	 */
-
-	I915_WRITE(INSTPM, (1 << 5) | (1 << 21));
-
 	ret = intel_fbdev_init(dev);
 	if (ret)
 		goto cleanup_irq;