From: Yang Kuankuan <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>, Mark Brown <broonie@kernel.org>,
Philipp Zabel <p.zabel@pengutronix.de>
Subject: Re: [PATCH RFC 01/11] drm: bridge/dw_hdmi: clean up hdmi_set_clk_regenerator()
Date: Tue, 31 Mar 2015 02:55:53 -0400 [thread overview]
Message-ID: <551A44F9.80108@rock-chips.com> (raw)
In-Reply-To: <E1YcfXV-0002uL-9O@rmk-PC.arm.linux.org.uk>
Hi Russell,
On 03/30/2015 03:40 PM, Russell King wrote:
> 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>
> ---
> 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 cca1c3d165e2..49df6c8c4ea8 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);
I'm okay with this change, and also I am preparing that collect N/CTS
setting to an array, like this :
struct n_cts {
unsigned int cts;
unsigned int n;
};
struct tmds_n_cts {
unsigned long tmds;
/* 1 entry each for 32KHz, 44.1KHz, and 48KHz */
struct n_cts n_cts[3];
};
static const struct tmds_n_cts n_cts_table[] = {
{ 25175000, {{ 28125, 4576}, { 31250, 7007}, { 25175, 6144} } },
}
But I am confused by the "hdmi->ratio", this variable was modify to 100
in bind
funciton, then nowhere would change it again. In this case "hdmi->ratio"
seems
an unused variable, can we remove it ?
Best regards.
Yakir Yang
> mutex_unlock(&hdmi->audio_mutex);
> }
>
next prev parent reply other threads:[~2015-03-31 6:55 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-30 19:39 [RFC 0/11] dw_hdmi cleanups, audio preparation, helpers and ahb audio support Russell King - ARM Linux
2015-03-30 19:40 ` [PATCH RFC 01/11] drm: bridge/dw_hdmi: clean up hdmi_set_clk_regenerator() Russell King
2015-03-31 6:55 ` Yang Kuankuan [this message]
2015-03-31 10:35 ` Russell King - ARM Linux
2015-04-01 1:54 ` Yakir
2015-03-30 19:40 ` [PATCH RFC 02/11] drm: bridge/dw_hdmi: use drm_hdmi_avi_infoframe_from_display_mode() Russell King
2015-03-31 9:02 ` Yang Kuankuan
2015-03-31 11:57 ` Russell King - ARM Linux
2015-04-01 1:31 ` Yakir
2015-03-30 19:40 ` [PATCH RFC 03/11] drm: bridge/dw_hdmi: simplify hdmi_config_AVI() a little Russell King
2015-03-30 19:40 ` [PATCH RFC 04/11] drm: bridge/dw_hdmi: remove mhsyncpolarity/mvsyncpolarity/minterlaced Russell King
2015-03-30 19:40 ` [PATCH RFC 05/11] drm: bridge/dw_hdmi: introduce interface to setting sample rate Russell King
2015-03-30 19:40 ` [PATCH RFC 06/11] drm: bridge/dw_hdmi: introduce interfaces to enable and disable audio Russell King
2015-03-31 7:45 ` Yang Kuankuan
2015-03-31 9:15 ` Philipp Zabel
2015-03-30 19:40 ` [PATCH RFC 07/11] drm/edid: add function to help find SADs Russell King
2015-04-01 11:47 ` Jani Nikula
2015-04-01 11:56 ` Russell King - ARM Linux
2015-04-02 10:52 ` [PATCH] drm/edid: add #defines for ELD versions Jani Nikula
2015-03-30 19:40 ` [PATCH RFC 08/11] sound/core: add DRM ELD helper Russell King
2015-03-31 9:12 ` Philipp Zabel
2015-03-30 19:40 ` [PATCH RFC 09/11] sound/core: add IEC958 channel status helper Russell King
2015-03-31 8:30 ` Yang Kuankuan
2015-03-31 9:13 ` Russell King - ARM Linux
2015-04-01 2:04 ` Yakir
2015-04-01 7:58 ` Russell King - ARM Linux
2015-03-31 9:10 ` Philipp Zabel
2015-03-31 9:16 ` Russell King - ARM Linux
2015-03-30 19:40 ` [PATCH RFC 10/11] drm: bridge/dw_hdmi-ahb-audio: add audio driver Russell King
2015-03-30 19:40 ` [PATCH RFC 11/11] drm: bridge/dw_hdmi-ahb-audio: parse ELD from HDMI driver Russell King
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=551A44F9.80108@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 \
/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).