ASoC: qcom: q6apm-lpass-dai: move graph start to trigger

Start the graph at trigger callback. Staring the graph at prepare does
not make sense as there is no data transfer at this point.
Moving this to trigger will also help cope situation where pipewire
is not happy if display port is not connected during start.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Link: https://patch.msgid.link/20260402081118.348071-12-srinivas.kandagatla@oss.qualcomm.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/qcom/qdsp6/q6apm-lpass-dais.c b/sound/soc/qcom/qdsp6/q6apm-lpass-dais.c
index 87f6db12003e3ae2bdc7358e12eb548cec447138..e904066484d5cf0e6ed0cd12733866e5824d6263 100644 (file)
--- a/sound/soc/qcom/qdsp6/q6apm-lpass-dais.c
+++ b/sound/soc/qcom/qdsp6/q6apm-lpass-dais.c
@@ -159,6 +159,31 @@ static void q6apm_lpass_dai_shutdown(struct snd_pcm_substream *substream, struct
        }
 }
 
+static int q6apm_lpass_dai_trigger(struct snd_pcm_substream *substream, int cmd,
+                                  struct snd_soc_dai *dai)
+{
+       struct q6apm_lpass_dai_data *dai_data = dev_get_drvdata(dai->dev);
+       int ret = 0;
+
+       switch (cmd) {
+       case SNDRV_PCM_TRIGGER_START:
+       case SNDRV_PCM_TRIGGER_RESUME:
+       case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+               if (!dai_data->is_port_started[dai->id]) {
+                       ret = q6apm_graph_start(dai_data->graph[dai->id]);
+                       if (ret < 0)
+                               dev_err(dai->dev, "Failed to start APM port %d\n", dai->id);
+                       else
+                               dai_data->is_port_started[dai->id] = true;
+               }
+               break;
+       default:
+               break;
+       }
+
+       return ret;
+}
+
 static int q6apm_lpass_dai_prepare(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)
 {
        struct q6apm_lpass_dai_data *dai_data = dev_get_drvdata(dai->dev);
@@ -171,10 +196,6 @@ static int q6apm_lpass_dai_prepare(struct snd_pcm_substream *substream, struct s
                q6apm_graph_stop(dai_data->graph[dai->id]);
                dai_data->is_port_started[dai->id] = false;
 
-               if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                       q6apm_graph_close(dai_data->graph[dai->id]);
-                       dai_data->graph[dai->id] = NULL;
-               }
        }
 
        /**
@@ -203,14 +224,6 @@ static int q6apm_lpass_dai_prepare(struct snd_pcm_substream *substream, struct s
                dev_err(dai->dev, "Failed to prepare Graph %d\n", rc);
                goto err;
        }
-
-       rc = q6apm_graph_start(dai_data->graph[dai->id]);
-       if (rc < 0) {
-               dev_err(dai->dev, "Failed to start APM port %d\n", dai->id);
-               goto err;
-       }
-       dai_data->is_port_started[dai->id] = true;
-
        return 0;
 err:
        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
@@ -254,6 +267,7 @@ static const struct snd_soc_dai_ops q6dma_ops = {
        .shutdown       = q6apm_lpass_dai_shutdown,
        .set_channel_map  = q6dma_set_channel_map,
        .hw_params        = q6dma_hw_params,
+       .trigger        = q6apm_lpass_dai_trigger,
 };
 
 static const struct snd_soc_dai_ops q6i2s_ops = {
@@ -263,6 +277,7 @@ static const struct snd_soc_dai_ops q6i2s_ops = {
        .set_channel_map  = q6dma_set_channel_map,
        .hw_params        = q6dma_hw_params,
        .set_fmt        = q6i2s_set_fmt,
+       .trigger        = q6apm_lpass_dai_trigger,
 };
 
 static const struct snd_soc_dai_ops q6hdmi_ops = {
@@ -271,6 +286,7 @@ static const struct snd_soc_dai_ops q6hdmi_ops = {
        .shutdown       = q6apm_lpass_dai_shutdown,
        .hw_params      = q6hdmi_hw_params,
        .set_fmt        = q6i2s_set_fmt,
+       .trigger        = q6apm_lpass_dai_trigger,
 };
 
 static const struct snd_soc_component_driver q6apm_lpass_dai_component = {