FROMLIST: drm: dw-hdmi-i2s: enable audio clock in audio_startup In the designware databook, the sequence of enabling audio clock and setting format is not clearly specified. Currently, audio clock is enabled in the end of hw_param ops after setting format. On some monitors, there is a possibility that audio does not come out. Fix this by enabling audio clock in audio_startup ops before hw_param ops setting format. Signed-off-by: Cheng-Yi Chiang <cychiang@chromium.org> (am from https://patchwork.kernel.org/patch/11120287/) (also found at https://lkml.kernel.org/r/20190829042957.150929-1-cychiang@chromium.org) BUG=chromium:998344 TEST=use repeat_sox.sh script in issue #2 Change-Id: Ib7fcae3080aaa195553b495467d082c010d81371 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/1774430 Reviewed-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> Tested-by: Douglas Anderson <dianders@chromium.org> Commit-Queue: Cheng-Yi Chiang <cychiang@chromium.org> (cherry picked from commit cadf8b3e0d52b16c63c286750a4626d7b0f663ce) Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/1782745
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 aba86c5..d65278c 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
@@ -72,6 +72,14 @@ static int dw_hdmi_i2s_hw_params(struct device *dev, void *data, hdmi_write(audio, conf0, HDMI_AUD_CONF0); hdmi_write(audio, conf1, HDMI_AUD_CONF1); + return 0; +} + +static int dw_hdmi_i2s_audio_startup(struct device *dev, void *data) +{ + struct dw_hdmi_i2s_audio_data *audio = data; + struct dw_hdmi *hdmi = audio->hdmi; + dw_hdmi_audio_enable(hdmi); return 0; @@ -118,6 +126,7 @@ static int dw_hdmi_i2s_hook_plugged_cb(struct device *dev, void *data, } static struct hdmi_codec_ops dw_hdmi_i2s_ops = { + .audio_startup = dw_hdmi_i2s_audio_startup, .hw_params = dw_hdmi_i2s_hw_params, .audio_shutdown = dw_hdmi_i2s_audio_shutdown, .get_dai_id = dw_hdmi_i2s_get_dai_id,