From: Cheng-Yi Chiang <cychiang@chromium•org>
To: linux-kernel@vger•kernel.org
Cc: alsa-devel@alsa-project•org, kuninori.morimoto.gx@renesas•com,
Neil Armstrong <narmstrong@baylibre•com>,
airlied@linux•ie, dri-devel@lists•freedesktop.org,
cain.cai@rock-chips•com, a.hajda@samsung•com,
Laurent.pinchart@ideasonboard•com,
Yakir Yang <ykk@rock-chips•com>,
sam@ravnborg•org, Jerome Brunet <jbrunet@baylibre•com>,
zhengxing@rock-chips•com, linux-rockchip@lists•infradead.org,
dgreid@chromium•org, cychiang@chromium•org, tzungbi@chromium•org,
Jonas Karlman <jonas@kwiboo•se>,
jeffy.chen@rock-chips•com, eddie.cai@rock-chips•com,
linux-arm-kernel@lists•infradead.org,
Jernej Skrabec <jernej.skrabec@siol•net>,
dianders@chromium•org, daniel@ffwll•ch,
enric.balletbo@collabora•com, kuankuan.y@gmail•com
Subject: [PATCH v3] drm: bridge/dw_hdmi: add audio sample channel status setting
Date: Wed, 11 Sep 2019 16:26:46 +0800 [thread overview]
Message-ID: <20190911082646.134347-1-cychiang@chromium.org> (raw)
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);
--
2.23.0.162.g0b9fbb3734-goog
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2019-09-11 8:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-11 8:26 Cheng-Yi Chiang [this message]
2019-09-11 16:23 ` [PATCH v3] drm: bridge/dw_hdmi: add audio sample channel status setting Neil Armstrong
2019-09-11 16:54 ` Jernej Škrabec
2019-09-11 17:02 ` Cheng-yi Chiang
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=20190911082646.134347-1-cychiang@chromium.org \
--to=cychiang@chromium$(echo .)org \
--cc=Laurent.pinchart@ideasonboard$(echo .)com \
--cc=a.hajda@samsung$(echo .)com \
--cc=airlied@linux$(echo .)ie \
--cc=alsa-devel@alsa-project$(echo .)org \
--cc=cain.cai@rock-chips$(echo .)com \
--cc=daniel@ffwll$(echo .)ch \
--cc=dgreid@chromium$(echo .)org \
--cc=dianders@chromium$(echo .)org \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=eddie.cai@rock-chips$(echo .)com \
--cc=enric.balletbo@collabora$(echo .)com \
--cc=jbrunet@baylibre$(echo .)com \
--cc=jeffy.chen@rock-chips$(echo .)com \
--cc=jernej.skrabec@siol$(echo .)net \
--cc=jonas@kwiboo$(echo .)se \
--cc=kuankuan.y@gmail$(echo .)com \
--cc=kuninori.morimoto.gx@renesas$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-rockchip@lists$(echo .)infradead.org \
--cc=narmstrong@baylibre$(echo .)com \
--cc=sam@ravnborg$(echo .)org \
--cc=tzungbi@chromium$(echo .)org \
--cc=ykk@rock-chips$(echo .)com \
--cc=zhengxing@rock-chips$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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