From patchwork Sun Oct 23 19:10:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 9391171 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5B1D260762 for ; Sun, 23 Oct 2016 19:12:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E70D28B53 for ; Sun, 23 Oct 2016 19:12:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 41E5528B56; Sun, 23 Oct 2016 19:12:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EDF8428B53 for ; Sun, 23 Oct 2016 19:12:49 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1byOAk-0002tP-VP; Sun, 23 Oct 2016 19:11:06 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:3201:214:fdff:fe10:1be6]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1byOAd-0002rF-3m for linux-arm-kernel@lists.infradead.org; Sun, 23 Oct 2016 19:11:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2014; h=Date:Sender:Message-Id:Content-Type:Content-Transfer-Encoding:MIME-Version:Subject:To:From:References:In-Reply-To; bh=bYyafXNhTgjfaLlMcL/YDzTbE/jmc8ObH7JnSGXQdzo=; b=m/XGRyFxXOtts0uCR7KDZuWoik6oSQ1ifh8g1WXRp03Au82GvKs+wq+lRU/VWUbb8RmCM3F+qeWqLUMiWwrSV0iFQa9W9mBciq9Qi5uY0xEmgXDEpSiT4VvERlx3NB+8CDg/dIrKZbS8eNP9rL28a8o2Z4sfCjxCwaPVmXYwMJg=; Received: from e0022681537dd.dyn.armlinux.org.uk ([2001:4d48:ad52:3201:222:68ff:fe15:37dd]:35452 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1byOAE-0001l4-UI; Sun, 23 Oct 2016 20:10:35 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1byOAE-0005yY-2W; Sun, 23 Oct 2016 20:10:34 +0100 In-Reply-To: <20161023191002.GJ1041@n2100.armlinux.org.uk> References: <20161023191002.GJ1041@n2100.armlinux.org.uk> From: Russell King To: dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH RFC 02/10] drm/i2c: tda998x: avoid configuring audio for DVI mode MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Sun, 23 Oct 2016 20:10:34 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161023_121059_576352_B3AB6091 X-CRM114-Status: GOOD ( 14.50 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP We must not configure the audio path when the sink is a DVI device, as DVI has no capability to receive HDMI audio. HDMI audio is a HDMI only feature, requiring HDMI infoframes. There's a question concerning how to handle a DVI connected device when the audio device is opened - we save the audio configuration, so that if a HDMI device is hotplugged, audio will then work. This seems a reasonable expectation. Signed-off-by: Russell King --- drivers/gpu/drm/i2c/tda998x_drv.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index d72bc30a3bce..495ee3fed661 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -44,6 +44,7 @@ struct tda998x_priv { u8 current_page; int dpms; bool is_hdmi_sink; + bool is_hdmi_config; u8 vip_cntrl_0; u8 vip_cntrl_1; u8 vip_cntrl_2; @@ -971,6 +972,8 @@ tda998x_encoder_mode_set(struct drm_encoder *encoder, div = 3; } + mutex_lock(&priv->audio_mutex); + /* mute the audio FIFO: */ reg_set(priv, REG_AIP_CNTRL_0, AIP_CNTRL_0_RST_FIFO); @@ -1074,13 +1077,14 @@ tda998x_encoder_mode_set(struct drm_encoder *encoder, tda998x_write_avi(priv, adjusted_mode); - mutex_lock(&priv->audio_mutex); if (priv->audio_params.format != AFMT_UNUSED) tda998x_configure_audio(priv, &priv->audio_params, adjusted_mode->clock); - mutex_unlock(&priv->audio_mutex); } + + priv->is_hdmi_config = priv->is_hdmi_sink; + mutex_unlock(&priv->audio_mutex); } static enum drm_connector_status @@ -1264,9 +1268,12 @@ static int tda998x_audio_hw_params(struct device *dev, void *data, } mutex_lock(&priv->audio_mutex); - ret = tda998x_configure_audio(priv, - &audio, - priv->encoder.crtc->hwmode.clock); + /* We must not program the TDA998x for audio if the sink is DVI. */ + if (priv->is_hdmi_config) + ret = tda998x_configure_audio(priv, &audio, + priv->encoder.crtc->hwmode.clock); + else + ret = 0; if (ret == 0) priv->audio_params = audio;