From ef0f442de139984ceff9568a3b5b838e01220ef2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Sat, 6 Mar 2010 13:03:37 +0000
Subject: [PATCH] --- yaml --- r: 189327 b: refs/heads/master c:
 0a7d934e6022a12e3f428b2adcb4b531e86170dd h: refs/heads/master i:   189325:
 390ced97df91e0fc043635466594dec9c97b56c6   189323:
 329d9e58426c7e9b7f23a85cae920dce618c3c20   189319:
 c5223564f93dc7b4a02baba081157c93ad00e851   189311:
 0ae8262b445f89e6638396c1a0980a043e7cb385 v: v3

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

diff --git a/[refs] b/[refs]
index a47541954d0f..7fe999ac29c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a8c6e7cfb63cc5e04d5c247ab8d6253200fd425
+refs/heads/master: 0a7d934e6022a12e3f428b2adcb4b531e86170dd
diff --git a/trunk/drivers/gpu/drm/radeon/r600_audio.c b/trunk/drivers/gpu/drm/radeon/r600_audio.c
index baf222faf158..dddb9e5e0c61 100644
--- a/trunk/drivers/gpu/drm/radeon/r600_audio.c
+++ b/trunk/drivers/gpu/drm/radeon/r600_audio.c
@@ -181,41 +181,6 @@ int r600_audio_init(struct radeon_device *rdev)
 	return 0;
 }
 
-/*
- * determin how the encoders and audio interface is wired together
- */
-int r600_audio_tmds_index(struct drm_encoder *encoder)
-{
-	struct drm_device *dev = encoder->dev;
-	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
-	struct drm_encoder *other;
-
-	switch (radeon_encoder->encoder_id) {
-	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
-	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
-	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
-		return 0;
-
-	case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
-		/* special case check if an TMDS1 is present */
-		list_for_each_entry(other, &dev->mode_config.encoder_list, head) {
-			if (to_radeon_encoder(other)->encoder_id ==
-				ENCODER_OBJECT_ID_INTERNAL_TMDS1)
-				return 1;
-		}
-		return 0;
-
-	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
-	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
-		return 1;
-
-	default:
-		DRM_ERROR("Unsupported encoder type 0x%02X\n",
-			  radeon_encoder->encoder_id);
-		return -1;
-	}
-}
-
 /*
  * atach the audio codec to the clock source of the encoder
  */