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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 5F2E6C41514 for ; Wed, 4 Sep 2019 09:10:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 243752339D for ; Wed, 4 Sep 2019 09:10:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Mlg5W6F0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728961AbfIDJJ7 (ORCPT ); Wed, 4 Sep 2019 05:09:59 -0400 Received: from mail-vk1-f195.google.com ([209.85.221.195]:35684 "EHLO mail-vk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726304AbfIDJJ6 (ORCPT ); Wed, 4 Sep 2019 05:09:58 -0400 Received: by mail-vk1-f195.google.com with SMTP id d66so2177891vka.2 for ; Wed, 04 Sep 2019 02:09:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=/7UND9SOq0N/Mu7NFRIefvWNsoxRo00bN5EWVx1PPmg=; b=Mlg5W6F0m6BbiO7bLUIcb9iudFcat5z/DX3B7/G8pCGiW9ROsclogeu2jIRlvHzM/d IXAxYvgqLjxSbY15XuPpr7HHx82st/A8TT7KGrkwiAwb718KqM9yKz4SKhMnx/QM2w1U SMLB3tK9KTJrgBY5A+s3bOjaPYoMoxO05sCsY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=/7UND9SOq0N/Mu7NFRIefvWNsoxRo00bN5EWVx1PPmg=; b=Mw9bcqQ4i5eFMvXTL7M4jyU8h5h+Jrm5PPc9C9HDcD2a40cQ3sdF9Ta/CQgSz3fTxb cT70tXK2GrOcEghOvi5GHPFVT38q3go6peyLDMuey5z2eau7ZyweM0edfe4KqPSitpbF KIdtue/pQBZPIwelzmYIqNPn3TdvsWGB702GcY3wbcBFKwUEfp2s2AaNe3j6tWBvBRyt txdmYIVMNKkGdPzOh7FNj8uz2a9952jjQhfrlh/o1tBWdn6KXpQzVjz2b5FmiLy/WRKS DS2//29o/LmHnLNILvGQX6kwCA7lt2Qjd3oPkkt+zCqZlClcV1l15N0Caxrh3RGM0kSQ kHhQ== X-Gm-Message-State: APjAAAW0z7pgyyCJpW9u5SpEp+A/MfyIZXVNl650rH/Idyji1xpiiAZ7 9c6mVMsqxed+x33YS+6MoIzaTm1tl8JHR+bSnWk21w== X-Google-Smtp-Source: APXvYqxyUrMUAEkf02GxMqWIIOzfSuvgtrLWM2sSGK16hyG7HzhEOSHPAFZCD4s0FpvvQcKVYvJ3YZLL0+Bj3C67BUA= X-Received: by 2002:ac5:c4f7:: with SMTP id b23mr14767555vkl.17.1567588196444; Wed, 04 Sep 2019 02:09:56 -0700 (PDT) MIME-Version: 1.0 References: <20190903055103.134764-1-cychiang@chromium.org> In-Reply-To: From: Cheng-yi Chiang Date: Wed, 4 Sep 2019 17:09:29 +0800 Message-ID: Subject: Re: [PATCH] drm: bridge/dw_hdmi: add audio sample channel status setting To: Neil Armstrong Cc: linux-kernel , "moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..." , tzungbi@chromium.org, Xing Zheng , kuninori.morimoto.gx@renesas.com, Andrzej Hajda , David Airlie , kuankuan.y@gmail.com, Jeffy Chen , Doug Anderson , dri-devel@lists.freedesktop.org, cain.cai@rock-chips.com, linux-rockchip@lists.infradead.org, =?UTF-8?B?6JSh5p6r?= , Laurent Pinchart , Daniel Vetter , Yakir Yang , Enric Balletbo i Serra , Dylan Reid , sam@ravnborg.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. 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, > > > 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=-6.7 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 584EFC3A5A7 for ; Wed, 4 Sep 2019 09:10:59 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 53A9421670 for ; Wed, 4 Sep 2019 09:10:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="H7NLhCaY"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Mlg5W6F0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 53A9421670 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 045FB168F; Wed, 4 Sep 2019 11:10:06 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 045FB168F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1567588256; bh=R4s8q+7Eg/NcdEdOKrNTC0P2KMo3tHnq+B9YEsHA9K0=; h=References:In-Reply-To:From:Date:To:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=H7NLhCaYhCQOntllQimSydyf1gAJrh4yrRt0FA3G9muu7Ekh1IUBeDgb5oMdzoVGV 21WWLOL2UOLYavFnI8aCTHpyNmMOS/tf6ruhSp4TfZVLZC3vh6Pwi8EIRd4aplGfnL VmNActolPLZ/TIwtQp9OEUmfODv7ZU1mEiN+IDR0= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 59C3FF80228; Wed, 4 Sep 2019 11:10:05 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4C89DF80228; Wed, 4 Sep 2019 11:10:03 +0200 (CEST) Received: from mail-vk1-xa44.google.com (mail-vk1-xa44.google.com [IPv6:2607:f8b0:4864:20::a44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 26ED1F80171 for ; Wed, 4 Sep 2019 11:09:58 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 26ED1F80171 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Mlg5W6F0" Received: by mail-vk1-xa44.google.com with SMTP id 130so675527vkn.13 for ; Wed, 04 Sep 2019 02:09:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=/7UND9SOq0N/Mu7NFRIefvWNsoxRo00bN5EWVx1PPmg=; b=Mlg5W6F0m6BbiO7bLUIcb9iudFcat5z/DX3B7/G8pCGiW9ROsclogeu2jIRlvHzM/d IXAxYvgqLjxSbY15XuPpr7HHx82st/A8TT7KGrkwiAwb718KqM9yKz4SKhMnx/QM2w1U SMLB3tK9KTJrgBY5A+s3bOjaPYoMoxO05sCsY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=/7UND9SOq0N/Mu7NFRIefvWNsoxRo00bN5EWVx1PPmg=; b=NeHdosPZNl28YhBm2sjKFJKB11GmezTd8vkkYdnlCeAVZ4bfzd3yMl7TUHUtJ7Pf3l DQ8vIyedgwUTpDiUY+khA6GVTbjkup05wUiP2nGeRhP8JBLMQwTsbBipSeadHHTiyxDP bT9mZebY8ZoD+tHjC2kFhN55rpaKXPe3ubZj05+P2bhsaAB2L8x6eBbQoTH/ELKRcUA5 J4+U9Tk7u7N8jznE80ZEna9mEORKT47KF61Oe4Kl94WoDapXy4BL87GibYvkyzlgfTez 6kMrk+B7yGS/NSVgGdzJX30HHzgnr8J3rjmzPdTBrOsWCn9DDR7SaVYd7QjUi1hbzIRR Q7vA== X-Gm-Message-State: APjAAAWMYkr0NIgPedvobZ2JQ09ThH4vEN7/44IElbsQsfMQbavPgQlt /9LmW3HVipWz1BtxA8Ypy7mjXfWAaP+fJHhcvvcOQg== X-Google-Smtp-Source: APXvYqxyUrMUAEkf02GxMqWIIOzfSuvgtrLWM2sSGK16hyG7HzhEOSHPAFZCD4s0FpvvQcKVYvJ3YZLL0+Bj3C67BUA= X-Received: by 2002:ac5:c4f7:: with SMTP id b23mr14767555vkl.17.1567588196444; Wed, 04 Sep 2019 02:09:56 -0700 (PDT) MIME-Version: 1.0 References: <20190903055103.134764-1-cychiang@chromium.org> In-Reply-To: From: Cheng-yi Chiang Date: Wed, 4 Sep 2019 17:09:29 +0800 Message-ID: To: Neil Armstrong Cc: "moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..." , tzungbi@chromium.org, kuninori.morimoto.gx@renesas.com, Xing Zheng , cain.cai@rock-chips.com, David Airlie , sam@ravnborg.org, Jeffy Chen , linux-kernel , dri-devel@lists.freedesktop.org, Doug Anderson , Andrzej Hajda , =?UTF-8?B?6JSh5p6r?= , Laurent Pinchart , Daniel Vetter , Yakir Yang , Enric Balletbo i Serra , linux-rockchip@lists.infradead.org, Dylan Reid , kuankuan.y@gmail.com, linux-arm-kernel@lists.infradead.org Subject: Re: [alsa-devel] [PATCH] drm: bridge/dw_hdmi: add audio sample channel status setting X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" 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. 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, > > > _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cheng-yi Chiang Subject: Re: [PATCH] drm: bridge/dw_hdmi: add audio sample channel status setting Date: Wed, 4 Sep 2019 17:09:29 +0800 Message-ID: References: <20190903055103.134764-1-cychiang@chromium.org> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Return-path: In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: Neil Armstrong Cc: linux-kernel , "moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..." , tzungbi@chromium.org, Xing Zheng , kuninori.morimoto.gx@renesas.com, Andrzej Hajda , David Airlie , kuankuan.y@gmail.com, Jeffy Chen , Doug Anderson , dri-devel@lists.freedesktop.org, cain.cai@rock-chips.com, linux-rockchip@lists.infradead.org, =?UTF-8?B?6JSh5p6r?= , Laurent Pinchart , Daniel Vetter , Yakir Yang , Enric Balletbo i Serra , Dylan Reid , sam@r List-Id: linux-rockchip.vger.kernel.org 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. 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, > > > 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 785C4C3A5A7 for ; Wed, 4 Sep 2019 09:10:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4AE8321670 for ; Wed, 4 Sep 2019 09:10:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="M/VSdu5O"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Mlg5W6F0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4AE8321670 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1nSSB318VddfVJ8u+fqmiFuYngUj1gc6/SuhmMFUBn4=; b=M/VSdu5OZRVEBa SHJkOoJR1OENNljPLrpJmOAbz3qXpYjLhJkeB0AgM4hbj2Orj1Fpi97md1g6nmwxiMtYVtwjVbWB8 B4kHZOAyUhIQMmUUopqWEZRAq722PhdEcuE6YLwIX++1M76M7niEImWFiAFPgMeD6/MBlW4ggvG3r f5e1xAtNEy0JtIt61zMW2Zkbpwav2k/GjANWPfo/sNiE/zVU310iFzUhgOzUY5DXptX8DoHPEvfHd L+kbb6jtXaX3AbGIvu63H2NV+tc8OeSaEhgEUUDAwtg0BcXuJHtWBHN0RVX6mx5T8WukolDzD4TpK a+rcVqvLwiVFhk6E+2LA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i5RIn-0005UP-7e; Wed, 04 Sep 2019 09:10:09 +0000 Received: from mail-vk1-xa44.google.com ([2607:f8b0:4864:20::a44]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i5RIg-0004mm-L6 for linux-arm-kernel@lists.infradead.org; Wed, 04 Sep 2019 09:10:05 +0000 Received: by mail-vk1-xa44.google.com with SMTP id u192so1653490vkb.12 for ; Wed, 04 Sep 2019 02:09:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=/7UND9SOq0N/Mu7NFRIefvWNsoxRo00bN5EWVx1PPmg=; b=Mlg5W6F0m6BbiO7bLUIcb9iudFcat5z/DX3B7/G8pCGiW9ROsclogeu2jIRlvHzM/d IXAxYvgqLjxSbY15XuPpr7HHx82st/A8TT7KGrkwiAwb718KqM9yKz4SKhMnx/QM2w1U SMLB3tK9KTJrgBY5A+s3bOjaPYoMoxO05sCsY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=/7UND9SOq0N/Mu7NFRIefvWNsoxRo00bN5EWVx1PPmg=; b=g983qX3AcP2zAc+DmDjB/80pnl8n8jDqgJdgt51+cIhYiKWQ/W4WyOAq/00sWgxQrt 0befPBWQJzu9saMQkEhUgE0DAUkJDnzVk96vavdF/t2wsXJxMEnpDQWOr2jg/gVehT3e fN1Z1jc5CeF3U4toRclQ8jxyDqDYktjH8ydrYu/WR4pDGLBjdDz/gj3zpVcuviFwdoDz lOo2keG8KZ7BhXujtiIYr/qvAoV98X7XSdEJQ+R5L7qBo4JSX4IB9DDs+SidyFuBYYiZ X7AkpQ8bSC5TmORgD+AgJ9hTxSzo8N+/VJHZosKv1yz1JtR8qMBAdoz6UD4Jgt8BUsi1 F4Jw== X-Gm-Message-State: APjAAAUmU2oCIkF4Vb7hyCLVSlTmieHKkBGEY3vB/2iGxCIlnvWTz+Vj EvyA9hp0SLFVWmRV3gF0rPg/PbzpYR58aQhBQTkwaA== X-Google-Smtp-Source: APXvYqxyUrMUAEkf02GxMqWIIOzfSuvgtrLWM2sSGK16hyG7HzhEOSHPAFZCD4s0FpvvQcKVYvJ3YZLL0+Bj3C67BUA= X-Received: by 2002:ac5:c4f7:: with SMTP id b23mr14767555vkl.17.1567588196444; Wed, 04 Sep 2019 02:09:56 -0700 (PDT) MIME-Version: 1.0 References: <20190903055103.134764-1-cychiang@chromium.org> In-Reply-To: From: Cheng-yi Chiang Date: Wed, 4 Sep 2019 17:09:29 +0800 Message-ID: Subject: Re: [PATCH] drm: bridge/dw_hdmi: add audio sample channel status setting To: Neil Armstrong X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190904_021002_713674_C3CDF4D0 X-CRM114-Status: GOOD ( 24.35 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..." , tzungbi@chromium.org, kuninori.morimoto.gx@renesas.com, Xing Zheng , cain.cai@rock-chips.com, David Airlie , sam@ravnborg.org, Jeffy Chen , linux-kernel , dri-devel@lists.freedesktop.org, Doug Anderson , Andrzej Hajda , =?UTF-8?B?6JSh5p6r?= , Laurent Pinchart , Daniel Vetter , Yakir Yang , Enric Balletbo i Serra , linux-rockchip@lists.infradead.org, Dylan Reid , kuankuan.y@gmail.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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. 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