From 15adaf0dfe1f6e8caec140737e584aa1a8b2877c Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Thu, 18 Apr 2013 09:42:13 -0400
Subject: [PATCH] --- yaml --- r: 371535 b: refs/heads/master c:
 9054ae1ce33f08315616999c742e6656b9967724 h: refs/heads/master i:   371533:
 0ebe40ff26857df01aeeae8b99141dacc58f91b4   371531:
 00dba7c2d7001588becab1d66710197190e5c209   371527:
 3385ac960195eb07dcbadd39b25c15f796a7dc5c   371519:
 524e6c850864d16f08de7d54cacff961c353f275 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/gpu/drm/radeon/r600_hdmi.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 34395408f0f8..0c9f03ac3474 100644
--- 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
index e419b98b0c47..95397b215701 100644
--- 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;