From: Yakir <ykk@rock-chips.com>
To: Russell King <rmk+kernel@arm.linux.org.uk>,
alsa-devel@alsa-project.org, dri-devel@lists.freedesktop.org,
linux-arm-kernel@lists.infradead.org
Cc: Fabio Estevam <fabio.estevam@freescale.com>,
David Airlie <airlied@linux.ie>, Takashi Iwai <tiwai@suse.de>,
Mark Brown <broonie@kernel.org>,
Philipp Zabel <p.zabel@pengutronix.de>
Subject: Re: [PATCH 03/13] drm: bridge/dw_hdmi: clean up hdmi_set_clk_regenerator()
Date: Fri, 22 May 2015 23:22:47 +0800 [thread overview]
Message-ID: <555F49C7.9060904@rock-chips.com> (raw)
In-Reply-To: <E1Yr1xO-0006kg-K0@rmk-PC.arm.linux.org.uk>
Hi Russell,
在 2015/5/9 18:26, Russell King 写道:
> Clean up hdmi_set_clk_regenerator() by allowing it to take the audio
> sample rate and ratio directly, rather than hiding it inside the
> function. Raise the unsupported pixel clock/sample rate message from
> debug to error level as this results in audio not working correctly.
>
> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Test on RK3288 platform, it works wells while do not need clear
the ncts_atomic_write bit in aud_n3, so no need more code it's find.
Test-by: <ykk@rock-chips.com>
Best regards,
Yakir Yang
> ---
> drivers/gpu/drm/bridge/dw_hdmi.c | 32 +++++++++++++++-----------------
> 1 file changed, 15 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/dw_hdmi.c b/drivers/gpu/drm/bridge/dw_hdmi.c
> index 23ea8c5c85b6..75099b80ca7e 100644
> --- a/drivers/gpu/drm/bridge/dw_hdmi.c
> +++ b/drivers/gpu/drm/bridge/dw_hdmi.c
> @@ -335,39 +335,37 @@ static unsigned int hdmi_compute_cts(unsigned int freq, unsigned long pixel_clk,
> }
>
> static void hdmi_set_clk_regenerator(struct dw_hdmi *hdmi,
> - unsigned long pixel_clk)
> + unsigned long pixel_clk, unsigned int sample_rate, unsigned int ratio)
> {
> - unsigned int clk_n, clk_cts;
> + unsigned int n, cts;
>
> - clk_n = hdmi_compute_n(hdmi->sample_rate, pixel_clk,
> - hdmi->ratio);
> - clk_cts = hdmi_compute_cts(hdmi->sample_rate, pixel_clk,
> - hdmi->ratio);
> -
> - if (!clk_cts) {
> - dev_dbg(hdmi->dev, "%s: pixel clock not supported: %lu\n",
> - __func__, pixel_clk);
> - return;
> + n = hdmi_compute_n(sample_rate, pixel_clk, ratio);
> + cts = hdmi_compute_cts(sample_rate, pixel_clk, ratio);
> + if (!cts) {
> + dev_err(hdmi->dev,
> + "%s: pixel clock/sample rate not supported: %luMHz / %ukHz\n",
> + __func__, pixel_clk, sample_rate);
> }
>
> - dev_dbg(hdmi->dev, "%s: samplerate=%d ratio=%d pixelclk=%lu N=%d cts=%d\n",
> - __func__, hdmi->sample_rate, hdmi->ratio,
> - pixel_clk, clk_n, clk_cts);
> + dev_dbg(hdmi->dev, "%s: samplerate=%ukHz ratio=%d pixelclk=%luMHz N=%d cts=%d\n",
> + __func__, sample_rate, ratio, pixel_clk, n, cts);
>
> - hdmi_set_cts_n(hdmi, clk_cts, clk_n);
> + hdmi_set_cts_n(hdmi, cts, n);
> }
>
> static void hdmi_init_clk_regenerator(struct dw_hdmi *hdmi)
> {
> mutex_lock(&hdmi->audio_mutex);
> - hdmi_set_clk_regenerator(hdmi, 74250000);
> + hdmi_set_clk_regenerator(hdmi, 74250000, hdmi->sample_rate,
> + hdmi->ratio);
> mutex_unlock(&hdmi->audio_mutex);
> }
>
> static void hdmi_clk_regenerator_update_pixel_clock(struct dw_hdmi *hdmi)
> {
> mutex_lock(&hdmi->audio_mutex);
> - hdmi_set_clk_regenerator(hdmi, hdmi->hdmi_data.video_mode.mpixelclock);
> + hdmi_set_clk_regenerator(hdmi, hdmi->hdmi_data.video_mode.mpixelclock,
> + hdmi->sample_rate, hdmi->ratio);
> mutex_unlock(&hdmi->audio_mutex);
> }
>
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2015-05-22 15:22 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-02 9:20 [RFC v2 0/13] dw_hdmi cleanups, audio preparation, helpers and ahb audio support Russell King - ARM Linux
2015-04-02 9:21 ` [PATCH RFC v2 01/13] drm: imx/dw_hdmi: move phy comments Russell King
2015-04-02 9:21 ` [PATCH RFC v2 02/13] drm: bridge/dw_hdmi: clean up phy configuration Russell King
2015-04-02 9:21 ` [PATCH RFC v2 03/13] drm: bridge/dw_hdmi: clean up hdmi_set_clk_regenerator() Russell King
2015-04-02 9:21 ` [PATCH RFC v2 04/13] drm: bridge/dw_hdmi: use drm_hdmi_avi_infoframe_from_display_mode() Russell King
2015-04-02 9:21 ` [PATCH RFC v2 05/13] drm: bridge/dw_hdmi: simplify hdmi_config_AVI() a little Russell King
2015-04-02 9:21 ` [PATCH RFC v2 06/13] drm: bridge/dw_hdmi: remove mhsyncpolarity/mvsyncpolarity/minterlaced Russell King
2015-04-02 9:21 ` [PATCH RFC v2 07/13] drm: bridge/dw_hdmi: introduce interface to setting sample rate Russell King
2015-04-02 9:21 ` [PATCH RFC v2 08/13] drm: bridge/dw_hdmi: introduce interfaces to enable and disable audio Russell King
2015-04-02 9:22 ` [PATCH RFC v2 09/13] drm/edid: add function to help find SADs Russell King
2015-04-02 9:22 ` [PATCH RFC v2 10/13] sound/core: add DRM ELD helper Russell King
2015-04-05 15:57 ` Takashi Iwai
2015-04-05 16:20 ` Russell King - ARM Linux
2015-04-05 16:46 ` Takashi Iwai
2015-04-05 17:26 ` Russell King - ARM Linux
2015-05-06 17:02 ` Anssi Hannula
2015-05-07 10:41 ` Russell King - ARM Linux
2015-05-07 11:11 ` Lars-Peter Clausen
2015-05-08 10:56 ` [alsa-devel] " Jyri Sarha
2015-05-08 11:42 ` Russell King - ARM Linux
2015-05-05 22:35 ` Mark Brown
2015-05-06 8:58 ` Liam Girdwood
2015-05-08 13:16 ` [alsa-devel] " Jyri Sarha
2015-05-08 13:27 ` Russell King - ARM Linux
2015-05-08 13:37 ` Jyri Sarha
2015-04-02 9:22 ` [PATCH RFC v2 11/13] sound/core: add IEC958 channel status helper Russell King
2015-04-02 9:22 ` [PATCH RFC v2 12/13] drm: bridge/dw_hdmi-ahb-audio: add audio driver Russell King
2015-04-02 9:22 ` [PATCH RFC v2 13/13] drm: bridge/dw_hdmi-ahb-audio: parse ELD from HDMI driver Russell King
2015-05-09 10:25 ` [PATCH v3 0/13] dw_hdmi cleanups, audio preparation, helpers and ahb audio support Russell King - ARM Linux
2015-05-09 10:25 ` [PATCH 01/13] drm: imx/dw_hdmi: move phy comments Russell King
2015-05-09 10:26 ` [PATCH 02/13] drm: bridge/dw_hdmi: clean up phy configuration Russell King
2015-05-22 15:19 ` Yakir
2015-05-09 10:26 ` [PATCH 03/13] drm: bridge/dw_hdmi: clean up hdmi_set_clk_regenerator() Russell King
2015-05-22 15:22 ` Yakir [this message]
2015-05-09 10:26 ` [PATCH 04/13] drm: bridge/dw_hdmi: use drm_hdmi_avi_infoframe_from_display_mode() Russell King
2015-05-09 10:26 ` [PATCH 05/13] drm: bridge/dw_hdmi: simplify hdmi_config_AVI() a little Russell King
2015-05-09 10:26 ` [PATCH 06/13] drm: bridge/dw_hdmi: remove mhsyncpolarity/mvsyncpolarity/minterlaced Russell King
2015-05-09 10:26 ` [PATCH 07/13] drm: bridge/dw_hdmi: introduce interface to setting sample rate Russell King
2015-05-22 15:26 ` Yakir
2015-05-09 10:26 ` [PATCH 08/13] drm: bridge/dw_hdmi: introduce interfaces to enable and disable audio Russell King
2015-05-22 15:28 ` Yakir
2015-05-09 10:26 ` [PATCH 09/13] drm/edid: add function to help find SADs Russell King
2015-05-09 10:26 ` [PATCH 10/13] sound/core: add DRM ELD helper Russell King
2015-05-22 12:20 ` [alsa-devel] " Mark Brown
2015-05-22 13:15 ` Russell King - ARM Linux
2015-05-22 13:30 ` Takashi Iwai
2015-05-22 13:53 ` Russell King - ARM Linux
2015-05-22 13:54 ` Takashi Iwai
2015-05-22 14:00 ` Russell King - ARM Linux
2015-05-22 14:02 ` Takashi Iwai
2015-05-22 14:05 ` Takashi Iwai
2015-05-22 16:12 ` Russell King - ARM Linux
2015-05-09 10:26 ` [PATCH 11/13] sound/core: add IEC958 channel status helper Russell King
2015-05-22 12:40 ` Mark Brown
2015-05-09 10:26 ` [PATCH 12/13] drm: bridge/dw_hdmi-ahb-audio: add audio driver Russell King
2015-05-09 16:49 ` [alsa-devel] " Anssi Hannula
2015-05-09 16:55 ` Russell King - ARM Linux
2015-05-09 17:07 ` Anssi Hannula
2015-05-09 17:40 ` Russell King - ARM Linux
2015-05-09 17:53 ` Russell King - ARM Linux
2015-05-09 17:55 ` Anssi Hannula
2015-05-09 18:11 ` Russell King - ARM Linux
2015-05-10 18:59 ` Anssi Hannula
2015-05-10 19:33 ` Russell King - ARM Linux
2015-05-10 20:47 ` Anssi Hannula
2015-05-11 15:58 ` Mark Brown
2015-05-09 10:26 ` [PATCH 13/13] drm: bridge/dw_hdmi-ahb-audio: parse ELD from HDMI driver Russell King
2015-05-27 10:43 ` Daniel Vetter
2015-05-27 11:43 ` Mark Brown
2015-05-27 17:31 ` Russell King - ARM Linux
2015-05-27 21:29 ` Daniel Vetter
2015-05-27 21:44 ` Russell King - ARM Linux
2015-05-28 6:43 ` Daniel Vetter
2015-05-28 4:56 ` [alsa-devel] " Takashi Iwai
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=555F49C7.9060904@rock-chips.com \
--to=ykk@rock-chips.com \
--cc=airlied@linux.ie \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=fabio.estevam@freescale.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=p.zabel@pengutronix.de \
--cc=rmk+kernel@arm.linux.org.uk \
--cc=tiwai@suse.de \
/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).