---

yaml --- r: 329587 b: refs/heads/master c: fb6ca6d h: refs/heads/master i: 329585: 7c347f1 329583: 2982122 v: v3
git-mirror · Sep 27, 2012 · bab9583 · bab9583
1 parent 0a0f257
commit bab9583
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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.