From patchwork Sat Mar 6 13:03:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 83904 Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o26D4dSs021539 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sat, 6 Mar 2010 13:05:17 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1NntfY-0006pd-8W; Sat, 06 Mar 2010 13:03:48 +0000 Received: from sfi-mx-3.v28.ch3.sourceforge.com ([172.29.28.123] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1NntfX-0006pB-4y for dri-devel@lists.sourceforge.net; Sat, 06 Mar 2010 13:03:47 +0000 Received-SPF: pass (sfi-mx-3.v28.ch3.sourceforge.com: domain of gmail.com designates 209.85.218.219 as permitted sender) client-ip=209.85.218.219; envelope-from=zajec5@gmail.com; helo=mail-bw0-f219.google.com; Received: from mail-bw0-f219.google.com ([209.85.218.219]) by sfi-mx-3.v28.ch3.sourceforge.com with esmtp (Exim 4.69) id 1NntfU-0005lo-U8 for dri-devel@lists.sourceforge.net; Sat, 06 Mar 2010 13:03:47 +0000 Received: by mail-bw0-f219.google.com with SMTP id 19so1213456bwz.6 for ; Sat, 06 Mar 2010 05:03:44 -0800 (PST) Received: by 10.204.141.67 with SMTP id l3mr986323bku.38.1267880621147; Sat, 06 Mar 2010 05:03:41 -0800 (PST) Received: from localhost.localdomain (ara8.neoplus.adsl.tpnet.pl [83.26.186.8]) by mx.google.com with ESMTPS id 13sm139658bwz.15.2010.03.06.05.03.39 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 06 Mar 2010 05:03:40 -0800 (PST) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: dri-devel@lists.sourceforge.net, Dave Airlie Subject: [PATCH 5/6] drm/radeon/kms: remove dead audio/HDMI code Date: Sat, 6 Mar 2010 14:03:37 +0100 Message-Id: <1267880618-9909-6-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1267880618-9909-1-git-send-email-zajec5@gmail.com> References: <1267880618-9909-1-git-send-email-zajec5@gmail.com> MIME-Version: 1.0 X-Spam-Score: -1.5 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record -0.0 DKIM_VERIFIED Domain Keys Identified Mail: signature passes verification 0.0 DKIM_SIGNED Domain Keys Identified Mail: message has a signature -0.0 AWL AWL: From: address is in the auto white-list X-Headers-End: 1NntfU-0005lo-U8 Cc: =?UTF-8?q?Christian=20K=C3=B6nig?= X-BeenThere: dri-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.sourceforge.net X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 06 Mar 2010 13:05:17 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/r600_audio.c b/drivers/gpu/drm/radeon/r600_audio.c index 2897bd7..1588316 100644 --- a/drivers/gpu/drm/radeon/r600_audio.c +++ b/drivers/gpu/drm/radeon/r600_audio.c @@ -182,41 +182,6 @@ int r600_audio_init(struct radeon_device *rdev) } /* - * 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 */ void r600_audio_set_clock(struct drm_encoder *encoder, int clock)