2023-07-05 13:01:21

by Srinivas Kandagatla

[permalink] [raw]
Subject: [PATCH] ASoC: qcom: q6afe-dai: fix Display Port Playback stream name

With recent changes to add more display ports did not change the Stream
name in q6afe-dai. This results in below error
"ASoC: Failed to add route DISPLAY_PORT_RX -> Display Port Playback(*)"
and sound card fails to probe.

Fix this by adding correct stream name.

Fixes: 90848a2557fe ("ASoC: qcom: q6dsp: add support to more display ports")
Reported-by: Amit Pundir <[email protected]>
Signed-off-by: Srinivas Kandagatla <[email protected]>
---
sound/soc/qcom/qdsp6/q6afe-dai.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/qcom/qdsp6/q6afe-dai.c b/sound/soc/qcom/qdsp6/q6afe-dai.c
index 31e0bad71e95..dbff55a97162 100644
--- a/sound/soc/qcom/qdsp6/q6afe-dai.c
+++ b/sound/soc/qcom/qdsp6/q6afe-dai.c
@@ -476,7 +476,7 @@ static int q6afe_mi2s_set_sysclk(struct snd_soc_dai *dai,

static const struct snd_soc_dapm_route q6afe_dapm_routes[] = {
{"HDMI Playback", NULL, "HDMI_RX"},
- {"Display Port Playback", NULL, "DISPLAY_PORT_RX"},
+ {"DISPLAY_PORT_RX_0 Playback", NULL, "DISPLAY_PORT_RX"},
{"Slimbus Playback", NULL, "SLIMBUS_0_RX"},
{"Slimbus1 Playback", NULL, "SLIMBUS_1_RX"},
{"Slimbus2 Playback", NULL, "SLIMBUS_2_RX"},
--
2.25.1



2023-07-05 13:21:25

by Amit Pundir

[permalink] [raw]
Subject: Re: [PATCH] ASoC: qcom: q6afe-dai: fix Display Port Playback stream name

On Wed, 5 Jul 2023 at 18:18, Srinivas Kandagatla
<[email protected]> wrote:
>
> With recent changes to add more display ports did not change the Stream
> name in q6afe-dai. This results in below error
> "ASoC: Failed to add route DISPLAY_PORT_RX -> Display Port Playback(*)"
> and sound card fails to probe.
>
> Fix this by adding correct stream name.

Tested-by: Amit Pundir <[email protected]> # tested on Dragonboard 845c

>
> Fixes: 90848a2557fe ("ASoC: qcom: q6dsp: add support to more display ports")
> Reported-by: Amit Pundir <[email protected]>
> Signed-off-by: Srinivas Kandagatla <[email protected]>
> ---
> sound/soc/qcom/qdsp6/q6afe-dai.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/soc/qcom/qdsp6/q6afe-dai.c b/sound/soc/qcom/qdsp6/q6afe-dai.c
> index 31e0bad71e95..dbff55a97162 100644
> --- a/sound/soc/qcom/qdsp6/q6afe-dai.c
> +++ b/sound/soc/qcom/qdsp6/q6afe-dai.c
> @@ -476,7 +476,7 @@ static int q6afe_mi2s_set_sysclk(struct snd_soc_dai *dai,
>
> static const struct snd_soc_dapm_route q6afe_dapm_routes[] = {
> {"HDMI Playback", NULL, "HDMI_RX"},
> - {"Display Port Playback", NULL, "DISPLAY_PORT_RX"},
> + {"DISPLAY_PORT_RX_0 Playback", NULL, "DISPLAY_PORT_RX"},
> {"Slimbus Playback", NULL, "SLIMBUS_0_RX"},
> {"Slimbus1 Playback", NULL, "SLIMBUS_1_RX"},
> {"Slimbus2 Playback", NULL, "SLIMBUS_2_RX"},
> --
> 2.25.1
>

2023-07-06 15:47:18

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH] ASoC: qcom: q6afe-dai: fix Display Port Playback stream name

On Wed, 05 Jul 2023 13:48:50 +0100, Srinivas Kandagatla wrote:
> With recent changes to add more display ports did not change the Stream
> name in q6afe-dai. This results in below error
> "ASoC: Failed to add route DISPLAY_PORT_RX -> Display Port Playback(*)"
> and sound card fails to probe.
>
> Fix this by adding correct stream name.
>
> [...]

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: qcom: q6afe-dai: fix Display Port Playback stream name
commit: 4f3fcf5f6dc8ab561e152c8747fd7e502b32266c

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark