From: Cheng-yi Chiang <cychiang@chromium.org>
To: "Jernej Škrabec" <jernej.skrabec@siol.net>
Cc: "moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER
MANAGEM..." <alsa-devel@alsa-project.org>,
"Doug Anderson" <dianders@chromium.org>,
kuninori.morimoto.gx@renesas.com,
"Neil Armstrong" <narmstrong@baylibre.com>,
"David Airlie" <airlied@linux.ie>,
dri-devel@lists.freedesktop.org, cain.cai@rock-chips.com,
"Andrzej Hajda" <a.hajda@samsung.com>,
"Laurent Pinchart" <Laurent.pinchart@ideasonboard.com>,
"Yakir Yang" <ykk@rock-chips.com>,
sam@ravnborg.org, "Jerome Brunet" <jbrunet@baylibre.com>,
"Xing Zheng" <zhengxing@rock-chips.com>,
linux-rockchip@lists.infradead.org,
"Dylan Reid" <dgreid@chromium.org>,
tzungbi@chromium.org, "Jonas Karlman" <jonas@kwiboo.se>,
"Jeffy Chen" <jeffy.chen@rock-chips.com>,
蔡枫 <eddie.cai@rock-chips.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel <linux-kernel@vger.kernel.org>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Enric Balletbo i Serra" <enric.balletbo@collabora.com>,
kuankuan.y@gmail.com
Subject: Re: [PATCH v3] drm: bridge/dw_hdmi: add audio sample channel status setting
Date: Thu, 12 Sep 2019 01:02:38 +0800 [thread overview]
Message-ID: <CAFv8NwJGa0HXsnv2MvJhknpr9PxUL3jH2HZLSLiSD5s_nHiQhQ@mail.gmail.com> (raw)
In-Reply-To: <10668907.r1TyVuJQb1@jernej-laptop>
On Thu, Sep 12, 2019 at 12:54 AM Jernej Škrabec <jernej.skrabec@siol.net> wrote:
>
> Dne sreda, 11. september 2019 ob 18:23:59 CEST je Neil Armstrong napisal(a):
> > On 11/09/2019 10:26, Cheng-Yi Chiang wrote:
> > > From: Yakir Yang <ykk@rock-chips.com>
> > >
> > > When transmitting IEC60985 linear PCM audio, we configure the
> > > Aduio Sample Channel Status information in the IEC60958 frame.
> > > The status bit is already available in iec.status of hdmi_codec_params.
> > >
> > > This fix the issue that audio does not come out on some monitors
> > > (e.g. LG 22CV241)
> > >
> > > Note that these registers are only for interfaces:
> > > I2S audio interface, General Purpose Audio (GPA), or AHB audio DMA
> > > (AHBAUDDMA).
> > > For S/PDIF interface this information comes from the stream.
> > >
> > > Currently this function dw_hdmi_set_channel_status is only called
> > > from dw-hdmi-i2s-audio in I2S setup.
> > >
> > > Signed-off-by: Yakir Yang <ykk@rock-chips.com>
> > > Signed-off-by: Cheng-Yi Chiang <cychiang@chromium.org>
> > > ---
> > >
> > > Change from v2 to v3:
> > > 1. Reuse what is already set in iec.status in hw_param.
> > > 2. Remove all useless definition of registers and values.
> > > 3. Note that the original sampling frequency is not written to
> > >
> > > the channel status as we reuse create_iec958_consumer in pcm_iec958.c.
> > > Without that it can still play audio fine.
> > >
> > > .../drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 1 +
> > > drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 20 +++++++++++++++++++
> > > drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 2 ++
> > > include/drm/bridge/dw_hdmi.h | 1 +
> > > 4 files changed, 24 insertions(+)
> > >
> > > diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
> > > b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c index
> > > 34d8e837555f..20f4f92dd866 100644
> > > --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
> > > +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
> > > @@ -102,6 +102,7 @@ static int dw_hdmi_i2s_hw_params(struct device *dev,
> > > void *data,>
> > > }
> > >
> > > dw_hdmi_set_sample_rate(hdmi, hparms->sample_rate);
> > >
> > > + dw_hdmi_set_channel_status(hdmi, hparms->iec.status);
> > >
> > > dw_hdmi_set_channel_count(hdmi, hparms->channels);
> > > dw_hdmi_set_channel_allocation(hdmi, hparms-
> >cea.channel_allocation);
> > >
> > > diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> > > b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index
> > > bd65d0479683..aa7efd4da1c8 100644
> > > --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> > > +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> > > @@ -582,6 +582,26 @@ static unsigned int hdmi_compute_n(unsigned int freq,
> > > unsigned long pixel_clk)>
> > > return n;
> > >
> > > }
> > >
> > > +/*
> > > + * When transmitting IEC60958 linear PCM audio, these 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).
> > > + */
> > > +void dw_hdmi_set_channel_status(struct dw_hdmi *hdmi,
> > > + u8 *channel_status)
> > > +{
> > > + /*
> > > + * Set channel status register for frequency and word length.
> > > + * Use default values for other registers.
> > > + */
> > > + hdmi_writeb(hdmi, channel_status[3], HDMI_FC_AUDSCHNLS7);
> > > + hdmi_writeb(hdmi, channel_status[4], HDMI_FC_AUDSCHNLS8);
> > > +}
> > > +EXPORT_SYMBOL_GPL(dw_hdmi_set_channel_status);
> > > +
> > >
> > > static void hdmi_set_clk_regenerator(struct dw_hdmi *hdmi,
> > >
> > > unsigned long pixel_clk, unsigned int sample_rate)
> > >
> > > {
> > >
> > > diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
> > > b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h index
> > > 6988f12d89d9..fcff5059db24 100644
> > > --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
> > > +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
> > > @@ -158,6 +158,8 @@
> > >
> > > #define HDMI_FC_SPDDEVICEINF 0x1062
> > > #define HDMI_FC_AUDSCONF 0x1063
> > > #define HDMI_FC_AUDSSTAT 0x1064
> > >
> > > +#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
> > >
> > > diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h
> > > index cf528c289857..4b3e863c4f8a 100644
> > > --- a/include/drm/bridge/dw_hdmi.h
> > > +++ b/include/drm/bridge/dw_hdmi.h
> > > @@ -156,6 +156,7 @@ void dw_hdmi_setup_rx_sense(struct dw_hdmi *hdmi, bool
> > > hpd, bool rx_sense);>
> > > void dw_hdmi_set_sample_rate(struct dw_hdmi *hdmi, unsigned int rate);
> > > void dw_hdmi_set_channel_count(struct dw_hdmi *hdmi, unsigned int cnt);
> > >
> > > +void dw_hdmi_set_channel_status(struct dw_hdmi *hdmi, u8
> > > *channel_status);
> > >
> > > void dw_hdmi_set_channel_allocation(struct dw_hdmi *hdmi, unsigned int
> > > ca);
> > > void dw_hdmi_audio_enable(struct dw_hdmi *hdmi);
> > > void dw_hdmi_audio_disable(struct dw_hdmi *hdmi);
> >
> > Looks fine for me:
> > Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
> >
> > Jonas ? Jernej ? Russell ?
>
> Patch itself is fine, I'm just wondering if more information should be copied
> from status array to registers. But I think they are not 1:1 mapping so some
> more work would be needed. Anyway, patch is:
Hi Jernej,
Yes you are right. I was thinking about the same thing.
But there are also some fields in the IEC60958 spec not mapped to the
registers on dw-hdmi.
So I ended up just writing the two registers in the original ykk's
patch, and ignoring "original sampling frequency" like pcm_iec958.
It turns out that audio plays fine on my LG monitor. So I suggest we
can keep this patch as simple as it is, and add more register setting
if we find issue.
Thanks!
>
>
> Reviewed-by: Jernej Skrabec <jernej.skrabec@siol.net>
>
> Best regards,
> Jernej
>
> >
> > If it's ok for you I'll apply it.
> >
> > Neil
>
>
>
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-09-11 17:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-11 8:26 [PATCH v3] drm: bridge/dw_hdmi: add audio sample channel status setting Cheng-Yi Chiang
2019-09-11 16:23 ` Neil Armstrong
2019-09-11 16:54 ` Jernej Škrabec
2019-09-11 17:02 ` Cheng-yi Chiang [this message]
2019-09-12 15:25 ` Jernej Škrabec
2019-09-13 6:37 ` Jonas Karlman
2019-09-13 8:46 ` Neil Armstrong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAFv8NwJGa0HXsnv2MvJhknpr9PxUL3jH2HZLSLiSD5s_nHiQhQ@mail.gmail.com \
--to=cychiang@chromium.org \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=a.hajda@samsung.com \
--cc=airlied@linux.ie \
--cc=alsa-devel@alsa-project.org \
--cc=cain.cai@rock-chips.com \
--cc=daniel@ffwll.ch \
--cc=dgreid@chromium.org \
--cc=dianders@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=eddie.cai@rock-chips.com \
--cc=enric.balletbo@collabora.com \
--cc=jbrunet@baylibre.com \
--cc=jeffy.chen@rock-chips.com \
--cc=jernej.skrabec@siol.net \
--cc=jonas@kwiboo.se \
--cc=kuankuan.y@gmail.com \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=narmstrong@baylibre.com \
--cc=sam@ravnborg.org \
--cc=tzungbi@chromium.org \
--cc=ykk@rock-chips.com \
--cc=zhengxing@rock-chips.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).