| From 6a56265de968b94a1a35cfb99bc731a99dce3f1c Mon Sep 17 00:00:00 2001 |
| From: Daniel Kurtz <djkurtz@chromium.org> |
| Date: Tue, 8 Oct 2019 18:21:45 +0800 |
| Subject: [PATCH] drm/bridge: dw-hdmi: Restore audio when setting a mode |
| |
| commit fadfee3f9d8f114435a8a3e9f83a227600d89de7 upstream. |
| |
| 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> |
| Reviewed-by: Neil Armstrong <narmstrong@baylibre.com> |
| Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20191008102145.55134-1-cychiang@chromium.org |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c |
| index 058c23069bfd..90f462c1555d 100644 |
| --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c |
| +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c |
| @@ -1906,7 +1906,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 */ |
| -- |
| 2.7.4 |
| |
