From bab9583acc07c27c0984a9a46a71ca6b890b2df7 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Wed, 26 Sep 2012 12:40:45 -0400
Subject: [PATCH] --- yaml --- r: 329587 b: refs/heads/master c:
 fb6ca6d154cdcd53e7f27f8dbba513830372699b h: refs/heads/master i:   329585:
 7c347f18a61924ee362de3033b0fb1d39141e04f   329583:
 29821228f382b30b1f8e4c2baa1eb0bf466802d6 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/gpu/drm/radeon/radeon_irq_kms.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9c1b2e52ba95..98e57b3ab826 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a6d59df80897cc87812b6826d70085905bed013
+refs/heads/master: fb6ca6d154cdcd53e7f27f8dbba513830372699b
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_irq_kms.c b/trunk/drivers/gpu/drm/radeon/radeon_irq_kms.c
index 2da4465e3c6d..b06fa5936100 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_irq_kms.c
+++ b/trunk/drivers/gpu/drm/radeon/radeon_irq_kms.c
@@ -208,6 +208,10 @@ static bool radeon_msi_ok(struct radeon_device *rdev)
 	    (rdev->pdev->subsystem_device == 0x0185))
 		return true;
 
+	/* try and enable MSIs by default on all RS690s */
+	if (rdev->family == CHIP_RS690)
+		return true;
+
 	/* RV515 seems to have MSI issues where it loses
 	 * MSI rearms occasionally. This leads to lockups and freezes.
 	 * disable it by default.