From 94f73003336599dd53915c7475a3a0cf9583ec6a Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 18 Sep 2009 14:31:48 +1000
Subject: [PATCH] --- yaml --- r: 164021 b: refs/heads/master c:
 65cb15a686cedab52abc336d7a400fe3a110ac4c h: refs/heads/master i:   164019:
 fbb8c098df72cbe406d0ad3f986bd484e9217d78 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/gpu/drm/radeon/rs600.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b9cbfd248f2b..30e5cd543830 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b15591f3120309093fc6d3df26b4242187d7b384
+refs/heads/master: 65cb15a686cedab52abc336d7a400fe3a110ac4c
diff --git a/trunk/drivers/gpu/drm/radeon/rs600.c b/trunk/drivers/gpu/drm/radeon/rs600.c
index c31bd8439259..6af0331cae08 100644
--- a/trunk/drivers/gpu/drm/radeon/rs600.c
+++ b/trunk/drivers/gpu/drm/radeon/rs600.c
@@ -272,11 +272,9 @@ int rs600_irq_set(struct radeon_device *rdev)
 		tmp |= RADEON_SW_INT_ENABLE;
 	}
 	if (rdev->irq.crtc_vblank_int[0]) {
-		tmp |= AVIVO_DISPLAY_INT_STATUS;
 		mode_int |= AVIVO_D1MODE_INT_MASK;
 	}
 	if (rdev->irq.crtc_vblank_int[1]) {
-		tmp |= AVIVO_DISPLAY_INT_STATUS;
 		mode_int |= AVIVO_D2MODE_INT_MASK;
 	}
 	WREG32(RADEON_GEN_INT_CNTL, tmp);