From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62646C3A5A7 for ; Wed, 4 Sep 2019 10:32:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 307C82339D for ; Wed, 4 Sep 2019 10:32:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b="H1pT9Bcm" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729559AbfIDKcP (ORCPT ); Wed, 4 Sep 2019 06:32:15 -0400 Received: from pandora.armlinux.org.uk ([78.32.30.218]:55974 "EHLO pandora.armlinux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727387AbfIDKcO (ORCPT ); Wed, 4 Sep 2019 06:32:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Sender:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=eI16o5+w+n4FAxabvHfUOK1ysd/txgxEdqOL0IS/T/M=; b=H1pT9Bcm83eK9BPr2iVRMOtaV OxqVZWF0NQmniKt/VG6W6F75t+H9EXliCkfkpZSpmINUPtaNsl7OmxLjGy/oRBqRBHUpGCSIZUXR+ dUOIjlBCoAhMI3xhR/2dMjbpYGk8K7x41AET4xAQU0WHdCzpDyL9+DXcegtUYiKDzoZIDuuEO3gop lIYEsQkuZZGn9EOe3NK7YObOX9l8Y6tWnHGIlQ0slPO2FBaKczHsPkW7/21V+R5lKIktRMUSXyy5t WcRtRMTgbHuZyHHRe1UT/T0o4ifayk7YBvR8D7W/y5qxuVxWIJ9geuFS1sTtfEhaN3tVd+EQAhQAa NFOmJ7rBA==; Received: from shell.armlinux.org.uk ([2001:4d48:ad52:3201:5054:ff:fe00:4ec]:56108) by pandora.armlinux.org.uk with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1i5SZz-0003ri-JI; Wed, 04 Sep 2019 11:31:59 +0100 Received: from linux by shell.armlinux.org.uk with local (Exim 4.92) (envelope-from ) id 1i5SZq-0004Sh-AS; Wed, 04 Sep 2019 11:31:50 +0100 Date: Wed, 4 Sep 2019 11:31:50 +0100 From: Russell King - ARM Linux admin To: Cheng-yi Chiang Cc: Neil Armstrong , "moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..." , Doug Anderson , kuninori.morimoto.gx@renesas.com, David Airlie , dri-devel@lists.freedesktop.org, linux-kernel , Andrzej Hajda , Laurent Pinchart , sam@ravnborg.org, Xing Zheng , linux-rockchip@lists.infradead.org, Dylan Reid , tzungbi@chromium.org, Jonas Karlman , Jeffy Chen , =?utf-8?B?6JSh5p6r?= , linux-arm-kernel@lists.infradead.org, Jernej Skrabec , cain.cai@rock-chips.com, Daniel Vetter , Enric Balletbo i Serra , kuankuan.y@gmail.com Subject: Re: [PATCH] drm: bridge/dw_hdmi: add audio sample channel status setting Message-ID: <20190904103150.GK13294@shell.armlinux.org.uk> References: <20190903055103.134764-1-cychiang@chromium.org> <1a167659-2eb1-d9be-c1ae-4958ac3f7929@baylibre.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Sep 04, 2019 at 05:45:20PM +0800, Cheng-yi Chiang wrote: > On Wed, Sep 4, 2019 at 5:28 PM Neil Armstrong wrote: > > > > Hi, > > > > On 04/09/2019 11:09, Cheng-yi Chiang wrote: > > > Hi, > > > > > > On Tue, Sep 3, 2019 at 5:53 PM Neil Armstrong wrote: > > >> > > >> Hi, > > >> > > >> On 03/09/2019 07:51, Cheng-Yi Chiang wrote: > > >>> From: Yakir Yang > > >>> > > >>> When transmitting IEC60985 linear PCM audio, we configure the > > >>> Audio Sample Channel Status information of all the channel > > >>> status bits in the IEC60958 frame. > > >>> Refer to 60958-3 page 10 for frequency, original frequency, and > > >>> wordlength setting. > > >>> > > >>> This fix the issue that audio does not come out on some monitors > > >>> (e.g. LG 22CV241) > > >>> > > >>> Signed-off-by: Yakir Yang > > >>> Signed-off-by: Cheng-Yi Chiang > > >>> --- > > >>> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 59 +++++++++++++++++++++++ > > >>> drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 20 ++++++++ > > >>> 2 files changed, 79 insertions(+) > > >>> > > >>> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > > >>> index bd65d0479683..34d46e25d610 100644 > > >>> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > > >>> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > > >>> @@ -582,6 +582,63 @@ static unsigned int hdmi_compute_n(unsigned int freq, unsigned long pixel_clk) > > >>> return n; > > >>> } > > >>> > > >>> +static void hdmi_set_schnl(struct dw_hdmi *hdmi) > > >>> +{ > > >>> + u8 aud_schnl_samplerate; > > >>> + u8 aud_schnl_8; > > >>> + > > >>> + /* These registers are on RK3288 using version 2.0a. */ > > >>> + if (hdmi->version != 0x200a) > > >>> + return; > > >> > > >> Are these limited to the 2.0a version *in* RK3288, or 2.0a version on all > > >> SoCs ? > > >> > > > > > > In the original patch by Yakir, > > > > > > https://lore.kernel.org/patchwork/patch/539653/ (sorry, I should > > > have added this link in the "after the cut" note) > > > > > > The fix is limited to version 2.0. > > > Since I am only testing on RK3288 with 2.0a, I change the check to 2.0a only. > > > I can not test 2.0a version on other SoCs. > > > The databook I have at hand is 2.0a (not specific to RK3288) so I > > > think all 2.0a should have this register. > > > > > > As for other version like version 1.3 on iMX6, there is no such > > > register, as stated by Russell > > > > > > http://lkml.iu.edu/hypermail/linux/kernel/1501.3/06268.html. > > > > Russell assumes the registers are not present on the iMX6 IP not having > > the I2S registers, but they are present on the IPs configured with I2S > > at any versions. > > I see. Thanks for the check. > > > > > My databook version (1.40.a) specifies : > > > > fc_audschnls0 to fc_audschnls8 > > > > ``` > > When transmitting IEC60958 linear PCM audio, this registers allow to configure the channel status > > information of all the channel status bits in the IEC60958 frame. For the moment this configuration is only > > used when the I2S audio interface, General Purpose Audio (GPA), or AHB audio DMA (AHBAUDDMA) > > interface is active (for S/PDIF interface this information comes from the stream). > > ``` > > > > But the databook Revision History shows these registers were present since version 1.10a. > > > > I propose you remove the version check, but you only setup these registers when I2S is enabled: > > (hdmi_readb(hdmi, HDMI_CONFIG0_ID) & HDMI_CONFIG0_I2S) until a AHBAUDDMA user needs this, > > with a small comment explaining the situation. > > I see. Sound like a good plan. > In sum, I will add > set_channel_status() > in dw_hdmi.c > And in the beginning of this function, > check it is using I2S > (hdmi_readb(hdmi, HDMI_CONFIG0_ID) & HDMI_CONFIG0_I2S) > with a comment explaining the situation. > > And let dw-hdmi-audio-i2s dw_hdmi_i2s_hw_params() to call this > function after dw_hdmi_set_sample_rate, with word length (or > sample_bit) passed it as argument. If you're going to do it this way, there's little point having the check. The dw-hdmi-audio-i2s device will only be created if that ID bit is already set. So, provided set_channel_status() (which should probably be dw_hdmi_set_channel_status()) is only called from the I2S driver, then everything should be fine without such a check. However, it is worth noting in the docbook comments above the function that it is only for I2S setups. > I have not tested setting this register here as in the original patch > it was set in hdmi_set_clk_regenerator. > I will test it and update in my v2. > > Thanks again to everyone for the prompt reply and help. > > > > > Neil > > > > > > > > So at least we should check the version. > > > Maybe we can set the criteria as version 2.0 or above to make it a safe patch ? > > > If there is the same need on other SoC with version < 2.0, it can be > > > added later. > > > Presumably, there will be databook of that version to help confirming > > > this setting. > > > > > > Thanks! > > >>> + > > >>> + switch (hdmi->sample_rate) { > > >>> + case 32000: > > >>> + aud_schnl_samplerate = HDMI_FC_AUDSCHNLS7_SMPRATE_32K; > > >>> + break; > > >>> + case 44100: > > >>> + aud_schnl_samplerate = HDMI_FC_AUDSCHNLS7_SMPRATE_44K1; > > >>> + break; > > >>> + case 48000: > > >>> + aud_schnl_samplerate = HDMI_FC_AUDSCHNLS7_SMPRATE_48K; > > >>> + break; > > >>> + case 88200: > > >>> + aud_schnl_samplerate = HDMI_FC_AUDSCHNLS7_SMPRATE_88K2; > > >>> + break; > > >>> + case 96000: > > >>> + aud_schnl_samplerate = HDMI_FC_AUDSCHNLS7_SMPRATE_96K; > > >>> + break; > > >>> + case 176400: > > >>> + aud_schnl_samplerate = HDMI_FC_AUDSCHNLS7_SMPRATE_176K4; > > >>> + break; > > >>> + case 192000: > > >>> + aud_schnl_samplerate = HDMI_FC_AUDSCHNLS7_SMPRATE_192K; > > >>> + break; > > >>> + case 768000: > > >>> + aud_schnl_samplerate = HDMI_FC_AUDSCHNLS7_SMPRATE_768K; > > >>> + break; > > >>> + default: > > >>> + dev_warn(hdmi->dev, "Unsupported audio sample rate (%u)\n", > > >>> + hdmi->sample_rate); > > >>> + return; > > >>> + } > > >>> + > > >>> + /* set channel status register */ > > >>> + hdmi_modb(hdmi, aud_schnl_samplerate, HDMI_FC_AUDSCHNLS7_SMPRATE_MASK, > > >>> + HDMI_FC_AUDSCHNLS7); > > >>> + > > >>> + /* > > >>> + * Set original frequency to be the same as frequency. > > >>> + * Use one-complement value as stated in IEC60958-3 page 13. > > >>> + */ > > >>> + aud_schnl_8 = (~aud_schnl_samplerate) << > > >>> + HDMI_FC_AUDSCHNLS8_ORIGSAMPFREQ_OFFSET; > > >>> + > > >>> + /* This means word length is 16 bit. Refer to IEC60958-3 page 12. */ > > >>> + aud_schnl_8 |= 2 << HDMI_FC_AUDSCHNLS8_WORDLEGNTH_OFFSET; > > >>> + > > >>> + hdmi_writeb(hdmi, aud_schnl_8, HDMI_FC_AUDSCHNLS8); > > >>> +} > > >>> + > > >>> static void hdmi_set_clk_regenerator(struct dw_hdmi *hdmi, > > >>> unsigned long pixel_clk, unsigned int sample_rate) > > >>> { > > >>> @@ -620,6 +677,8 @@ static void hdmi_set_clk_regenerator(struct dw_hdmi *hdmi, > > >>> hdmi->audio_cts = cts; > > >>> hdmi_set_cts_n(hdmi, cts, hdmi->audio_enable ? n : 0); > > >>> spin_unlock_irq(&hdmi->audio_lock); > > >>> + > > >>> + hdmi_set_schnl(hdmi); > > >>> } > > >>> > > >>> static void hdmi_init_clk_regenerator(struct dw_hdmi *hdmi) > > >>> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h > > >>> index 6988f12d89d9..619ebc1c8354 100644 > > >>> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h > > >>> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h > > >>> @@ -158,6 +158,17 @@ > > >>> #define HDMI_FC_SPDDEVICEINF 0x1062 > > >>> #define HDMI_FC_AUDSCONF 0x1063 > > >>> #define HDMI_FC_AUDSSTAT 0x1064 > > >>> +#define HDMI_FC_AUDSV 0x1065 > > >>> +#define HDMI_FC_AUDSU 0x1066 > > >>> +#define HDMI_FC_AUDSCHNLS0 0x1067 > > >>> +#define HDMI_FC_AUDSCHNLS1 0x1068 > > >>> +#define HDMI_FC_AUDSCHNLS2 0x1069 > > >>> +#define HDMI_FC_AUDSCHNLS3 0x106a > > >>> +#define HDMI_FC_AUDSCHNLS4 0x106b > > >>> +#define HDMI_FC_AUDSCHNLS5 0x106c > > >>> +#define HDMI_FC_AUDSCHNLS6 0x106d > > >>> +#define HDMI_FC_AUDSCHNLS7 0x106e > > >>> +#define HDMI_FC_AUDSCHNLS8 0x106f > > >>> #define HDMI_FC_DATACH0FILL 0x1070 > > >>> #define HDMI_FC_DATACH1FILL 0x1071 > > >>> #define HDMI_FC_DATACH2FILL 0x1072 > > >>> @@ -706,6 +717,15 @@ enum { > > >>> /* HDMI_FC_AUDSCHNLS7 field values */ > > >>> HDMI_FC_AUDSCHNLS7_ACCURACY_OFFSET = 4, > > >>> HDMI_FC_AUDSCHNLS7_ACCURACY_MASK = 0x30, > > >>> + HDMI_FC_AUDSCHNLS7_SMPRATE_MASK = 0x0f, > > >>> + HDMI_FC_AUDSCHNLS7_SMPRATE_192K = 0xe, > > >>> + HDMI_FC_AUDSCHNLS7_SMPRATE_176K4 = 0xc, > > >>> + HDMI_FC_AUDSCHNLS7_SMPRATE_96K = 0xa, > > >>> + HDMI_FC_AUDSCHNLS7_SMPRATE_768K = 0x9, > > >>> + HDMI_FC_AUDSCHNLS7_SMPRATE_88K2 = 0x8, > > >>> + HDMI_FC_AUDSCHNLS7_SMPRATE_32K = 0x3, > > >>> + HDMI_FC_AUDSCHNLS7_SMPRATE_48K = 0x2, > > >>> + HDMI_FC_AUDSCHNLS7_SMPRATE_44K1 = 0x0, > > >>> > > >>> /* HDMI_FC_AUDSCHNLS8 field values */ > > >>> HDMI_FC_AUDSCHNLS8_ORIGSAMPFREQ_MASK = 0xf0, > > >>> > > >> > > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > -- RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up According to speedtest.net: 11.9Mbps down 500kbps up