diff --git a/drivers/gpu/drm/display/drm_hdmi_audio_helper.c b/drivers/gpu/drm/display/drm_hdmi_audio_helper.c index aa3a5d0329dc..05afc9f0bdd6 100644 --- a/drivers/gpu/drm/display/drm_hdmi_audio_helper.c +++ b/drivers/gpu/drm/display/drm_hdmi_audio_helper.c @@ -129,7 +129,6 @@ EXPORT_SYMBOL(drm_connector_hdmi_audio_plugged_notify); static const struct hdmi_codec_ops drm_connector_hdmi_audio_ops = { .audio_startup = drm_connector_hdmi_audio_startup, .prepare = drm_connector_hdmi_audio_prepare, - .hw_params = drm_connector_hdmi_audio_prepare, .audio_shutdown = drm_connector_hdmi_audio_shutdown, .mute_stream = drm_connector_hdmi_audio_mute_stream, .get_eld = drm_connector_hdmi_audio_get_eld, diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index 69f98975e14a..a931d05ba89e 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -570,13 +570,13 @@ static int hdmi_codec_hw_params(struct snd_pcm_substream *substream, }; int ret; - if (!hcp->hcd.ops->hw_params) - return 0; - - dev_dbg(dai->dev, "%s() width %d rate %d channels %d\n", __func__, + dev_info(dai->dev, "%s() width %d rate %d channels %d\n", __func__, params_width(params), params_rate(params), params_channels(params)); + if (!hcp->hcd.ops->hw_params) + return 0; + ret = hdmi_codec_fill_codec_params(dai, params_width(params), params_rate(params), @@ -611,12 +611,12 @@ static int hdmi_codec_prepare(struct snd_pcm_substream *substream, struct hdmi_codec_params hp; int ret; + dev_info(dai->dev, "%s() width %d rate %d channels %d\n", __func__, + width, rate, channels); + if (!hcp->hcd.ops->prepare) return 0; - dev_dbg(dai->dev, "%s() width %d rate %d channels %d\n", __func__, - width, rate, channels); - ret = hdmi_codec_fill_codec_params(dai, width, rate, channels, &hp); if (ret < 0) return ret; diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c index 34ba1a93a4c9..030c573753cc 100644 --- a/sound/soc/soc-dai.c +++ b/sound/soc/soc-dai.c @@ -577,6 +577,7 @@ int snd_soc_pcm_dai_prepare(struct snd_pcm_substream *substream) int i, ret; for_each_rtd_dais(rtd, i, dai) { + pr_info("%s(), dai name=%s, id=%d\n", __func__, dai->name, dai->id); if (!snd_soc_dai_stream_valid(dai, substream->stream)) continue; if (dai->driver->ops &&