---

yaml --- r: 371535 b: refs/heads/master c: 9054ae1 h: refs/heads/master i: 371533: 0ebe40f 371531: 00dba7c 371527: 3385ac9 371519: 524e6c8 v: v3
git-mirror · Apr 22, 2013 · 15adaf0 · 15adaf0
1 parent 2118104
commit 15adaf0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcb852905772416e322536ced5cb3c796d176af5
+refs/heads/master: 9054ae1ce33f08315616999c742e6656b9967724
diff --git a/trunk/drivers/gpu/drm/radeon/r600_hdmi.c b/trunk/drivers/gpu/drm/radeon/r600_hdmi.c
@@ -461,7 +461,9 @@ void r600_hdmi_enable(struct drm_encoder *encoder)
 
 	if (rdev->irq.installed) {
 		/* if irq is available use it */
-		radeon_irq_kms_enable_afmt(rdev, dig->afmt->id);
+		/* XXX: shouldn't need this on any asics.  Double check DCE2/3 */
+		if (!ASIC_IS_DCE4(rdev))
+			radeon_irq_kms_enable_afmt(rdev, dig->afmt->id);
 	}
 
 	dig->afmt->enabled = true;