From: Neil Armstrong <narmstrong@baylibre.com>
To: Cheng-Yi Chiang <cychiang@chromium.org>, linux-kernel@vger.kernel.org
Cc: Jernej Skrabec <jernej.skrabec@siol.net>,
tzungbi@chromium.org, alsa-devel@alsa-project.org,
Jonas Karlman <jonas@kwiboo.se>,
dianders@chromium.org, dri-devel@lists.freedesktop.org,
Hans Verkuil <hverkuil@xs4all.nl>,
linux-rockchip@lists.infradead.org,
Russell King <rmk+kernel@armlinux.org.uk>,
Mark Brown <broonie@kernel.org>,
Daniel Kurtz <djkurtz@chromium.org>,
Yakir Yang <ykk@rock-chips.com>,
dgreid@chromium.org, linux-arm-kernel@lists.infradead.org,
Jerome Brunet <jbrunet@baylibre.com>
Subject: Re: [alsa-devel] [PATCH v3] drm/bridge: dw-hdmi: Restore audio when setting a mode
Date: Tue, 15 Oct 2019 09:46:36 +0200 [thread overview]
Message-ID: <d0f03ff3-2743-b3e1-1b53-c4ef26b158db@baylibre.com> (raw)
In-Reply-To: <20191008102145.55134-1-cychiang@chromium.org>
On 08/10/2019 12:21, Cheng-Yi Chiang wrote:
> From: Daniel Kurtz <djkurtz@chromium.org>
>
> When setting a new display mode, dw_hdmi_setup() calls
> dw_hdmi_enable_video_path(), which disables all hdmi clocks, including
> the audio clock.
>
> We should only (re-)enable the audio clock if audio was already enabled
> when setting the new mode.
>
> Without this patch, on RK3288, there will be HDMI audio on some monitors
> if i2s was played to headphone when the monitor was plugged.
> ACER H277HU and ASUS PB278 are two of the monitors showing this issue.
>
> Signed-off-by: Cheng-Yi Chiang <cychiang@chromium.org>
> Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
> Signed-off-by: Yakir Yang <ykk@rock-chips.com>
> ---
> Change from v2 to v3:
> - Remove spinlock around setting clock.
>
> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> index a15fbf71b9d7..af060162b0af 100644
> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> @@ -2054,7 +2054,7 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
>
> /* HDMI Initialization Step E - Configure audio */
> hdmi_clk_regenerator_update_pixel_clock(hdmi);
> - hdmi_enable_audio_clk(hdmi, true);
> + hdmi_enable_audio_clk(hdmi, hdmi->audio_enable);
> }
>
> /* not for DVI mode */
>
Looks coherent for me.
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Applying to drm-misc-next
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
prev parent reply other threads:[~2019-10-15 7:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-08 10:21 [alsa-devel] [PATCH v3] drm/bridge: dw-hdmi: Restore audio when setting a mode Cheng-Yi Chiang
2019-10-15 7:46 ` Neil Armstrong [this message]
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=d0f03ff3-2743-b3e1-1b53-c4ef26b158db@baylibre.com \
--to=narmstrong@baylibre.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=cychiang@chromium.org \
--cc=dgreid@chromium.org \
--cc=dianders@chromium.org \
--cc=djkurtz@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=hverkuil@xs4all.nl \
--cc=jbrunet@baylibre.com \
--cc=jernej.skrabec@siol.net \
--cc=jonas@kwiboo.se \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=rmk+kernel@armlinux.org.uk \
--cc=tzungbi@chromium.org \
--cc=ykk@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).