| From 18b1ff043d713b6b3669a8746062f2faeb6c3557 Mon Sep 17 00:00:00 2001 |
| From: Matthias Reichl <hias@horus.com> |
| Date: Thu, 19 Mar 2020 20:00:35 +0100 |
| Subject: [PATCH] drm/vc4: move setup from hw_params to prepare |
| |
| Configuring HDMI audio registers in prepare allows us to take |
| IEC958 bits into account which are set by the alsa hook after |
| the hw_params call. |
| |
| Signed-off-by: Matthias Reichl <hias@horus.com> |
| --- |
| drivers/gpu/drm/vc4/vc4_hdmi.c | 18 ++++++++++-------- |
| 1 file changed, 10 insertions(+), 8 deletions(-) |
| |
| --- a/drivers/gpu/drm/vc4/vc4_hdmi.c |
| +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c |
| @@ -958,8 +958,7 @@ static int sample_rate_to_mai_fmt(int sa |
| } |
| |
| /* HDMI audio codec callbacks */ |
| -static int vc4_hdmi_audio_hw_params(struct snd_pcm_substream *substream, |
| - struct snd_pcm_hw_params *params, |
| +static int vc4_hdmi_audio_prepare(struct snd_pcm_substream *substream, |
| struct snd_soc_dai *dai) |
| { |
| struct vc4_hdmi *vc4_hdmi = dai_to_hdmi(dai); |
| @@ -972,12 +971,15 @@ static int vc4_hdmi_audio_hw_params(stru |
| if (substream != vc4_hdmi->audio.substream) |
| return -EINVAL; |
| |
| - dev_dbg(dev, "%s: %u Hz, %d bit, %d channels\n", __func__, |
| - params_rate(params), params_width(params), |
| - params_channels(params)); |
| + dev_dbg(dev, "%s: %u Hz, %d bit, %d channels AES0=%02x\n", |
| + __func__, |
| + substream->runtime->rate, |
| + snd_pcm_format_width(substream->runtime->format), |
| + substream->runtime->channels, |
| + vc4_hdmi->audio.iec_status[0]); |
| |
| - vc4_hdmi->audio.channels = params_channels(params); |
| - vc4_hdmi->audio.samplerate = params_rate(params); |
| + vc4_hdmi->audio.channels = substream->runtime->channels; |
| + vc4_hdmi->audio.samplerate = substream->runtime->rate; |
| |
| HDMI_WRITE(HDMI_MAI_CTL, |
| VC4_HD_MAI_CTL_RESET | |
| @@ -1196,7 +1198,7 @@ static const struct snd_soc_component_dr |
| static const struct snd_soc_dai_ops vc4_hdmi_audio_dai_ops = { |
| .startup = vc4_hdmi_audio_startup, |
| .shutdown = vc4_hdmi_audio_shutdown, |
| - .hw_params = vc4_hdmi_audio_hw_params, |
| + .prepare = vc4_hdmi_audio_prepare, |
| .set_fmt = vc4_hdmi_audio_set_fmt, |
| .trigger = vc4_hdmi_audio_trigger, |
| }; |