From patchwork Tue Mar 30 17:30:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 89343 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 o2UHWnIK031751 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 30 Mar 2010 17:33:25 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 1NwfI5-0001KC-H1; Tue, 30 Mar 2010 17:31:49 +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 1NwfI4-0001K2-DE for dri-devel@lists.sourceforge.net; Tue, 30 Mar 2010 17:31:48 +0000 Received-SPF: pass (sfi-mx-3.v28.ch3.sourceforge.com: domain of vodafone.de designates 139.7.28.128 as permitted sender) client-ip=139.7.28.128; envelope-from=deathsimple@vodafone.de; helo=outgoing.email.vodafone.de; Received: from outgoing.email.vodafone.de ([139.7.28.128]) by sfi-mx-3.v28.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.69) id 1NwfI2-0003eM-HZ for dri-devel@lists.sourceforge.net; Tue, 30 Mar 2010 17:31:48 +0000 X-Authentication-Info: Sender authenticated as deathsimple@vodafone.de (using PLAIN) Received: from dslb-084-062-246-061.pools.arcor-ip.net ([84.62.246.61] helo=[10.0.1.10] envelope-sender=) by SMTPIN-09.smtp.email.vodafone.de with ESMTPA id 4BB23544.22244.552753; Tue, 30 Mar 2010 19:30:44 +0200 Subject: Re: Signalling no-audio for HDMI From: Christian =?ISO-8859-1?Q?K=F6nig?= To: post@hendrik-sattler.de, =?UTF-8?Q?Rafa=C5=82_Mi=C5=82ecki?= Date: Tue, 30 Mar 2010 19:30:38 +0200 Message-ID: <1269970238.2549.28.camel@zweiundvierzig> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 X-Spam-Score: -1.2 (-) 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_SIGNED Domain Keys Identified Mail: message has a signature 0.3 AWL AWL: From: address is in the auto white-list X-Headers-End: 1NwfI2-0003eM-HZ Cc: "dri-devel@lists.sourceforge.net" 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]); Tue, 30 Mar 2010 17:33:25 +0000 (UTC) >From 7226ccea04d48383fbf00577b8861461bcae2b02 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Christian=20K=C3=B6nig?= Date: Tue, 30 Mar 2010 19:19:20 +0200 Subject: [PATCH] drm/radeon/kms: disable HDMI encoders when audio codec is disabled Also disable the HDMI encoders if the audio codec is disabled by the module option. This fixes a strange bug, where an enabled HDMI encoder disables an external audio input at the TV. --- drivers/gpu/drm/radeon/radeon_encoders.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index 7f43476..05f62ec 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c @@ -611,7 +611,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) switch (connector->connector_type) { case DRM_MODE_CONNECTOR_DVII: case DRM_MODE_CONNECTOR_HDMIB: /* HDMI-B is basically DL-DVI; analog works fine */ - if (drm_detect_hdmi_monitor(radeon_connector->edid)) + if (drm_detect_hdmi_monitor(radeon_connector->edid) && radeon_audio) return ATOM_ENCODER_MODE_HDMI; else if (radeon_connector->use_digital) return ATOM_ENCODER_MODE_DVI; @@ -621,7 +621,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) case DRM_MODE_CONNECTOR_DVID: case DRM_MODE_CONNECTOR_HDMIA: default: - if (drm_detect_hdmi_monitor(radeon_connector->edid)) + if (drm_detect_hdmi_monitor(radeon_connector->edid) && radeon_audio) return ATOM_ENCODER_MODE_HDMI; else return ATOM_ENCODER_MODE_DVI; @@ -635,7 +635,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) if ((dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) || (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP)) return ATOM_ENCODER_MODE_DP; - else if (drm_detect_hdmi_monitor(radeon_connector->edid)) + else if (drm_detect_hdmi_monitor(radeon_connector->edid) && radeon_audio) return ATOM_ENCODER_MODE_HDMI; else return ATOM_ENCODER_MODE_DVI; -- 1.6.3.3