ASoC: qcom: q6asm: pass codec profile to q6asm_open_write

Codec profile is required to be passed for WMA codecs so that we know
the codec profile present and tell DSP accordingly, so update this API
to pass the codec profile as argument

Signed-off-by: Vinod Koul <vkoul@kernel.org>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20200316055221.1944464-4-vkoul@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/qcom/qdsp6/q6asm-dai.c b/sound/soc/qcom/qdsp6/q6asm-dai.c
index 8b48815ff9185ee595e95ef4cc0ec586b837db85..bc0e3f7cfd8ea3491d0df8f8676bcb7de3d871c3 100644 (file)
--- a/sound/soc/qcom/qdsp6/q6asm-dai.c
+++ b/sound/soc/qcom/qdsp6/q6asm-dai.c
@@ -252,7 +252,7 @@ static int q6asm_dai_prepare(struct snd_soc_component *component,
 
        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                ret = q6asm_open_write(prtd->audio_client, FORMAT_LINEAR_PCM,
-                                      prtd->bits_per_sample);
+                                      0, prtd->bits_per_sample);
        } else if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
                ret = q6asm_open_read(prtd->audio_client, FORMAT_LINEAR_PCM,
                                       prtd->bits_per_sample);
@@ -654,7 +654,7 @@ static int q6asm_dai_compr_set_params(struct snd_compr_stream *stream,
        prtd->bits_per_sample = 16;
        if (dir == SND_COMPRESS_PLAYBACK) {
                ret = q6asm_open_write(prtd->audio_client, params->codec.id,
-                                       prtd->bits_per_sample);
+                               params->codec.profile, prtd->bits_per_sample);
 
                if (ret < 0) {
                        dev_err(dev, "q6asm_open_write failed\n");

diff --git a/sound/soc/qcom/qdsp6/q6asm.c b/sound/soc/qcom/qdsp6/q6asm.c
index 36e0eab13a98311db9ca4be480e6e49ef205e991..64eb7b6ba3052dd58547d2881f59d5d1f80747fa 100644 (file)
--- a/sound/soc/qcom/qdsp6/q6asm.c
+++ b/sound/soc/qcom/qdsp6/q6asm.c
@@ -858,7 +858,7 @@ err:
  * Return: Will be an negative value on error or zero on success
  */
 int q6asm_open_write(struct audio_client *ac, uint32_t format,
-                    uint16_t bits_per_sample)
+                    u32 codec_profile, uint16_t bits_per_sample)
 {
        struct asm_stream_cmd_open_write_v3 *open;
        struct apr_pkt *pkt;

diff --git a/sound/soc/qcom/qdsp6/q6asm.h b/sound/soc/qcom/qdsp6/q6asm.h
index 6764f55f7078a81fb40d1ae19ced869fbf53f222..1cff7f68b95defa0ed6ccbfcd1354a7cf6a040ab 100644 (file)
--- a/sound/soc/qcom/qdsp6/q6asm.h
+++ b/sound/soc/qcom/qdsp6/q6asm.h
@@ -55,7 +55,7 @@ void q6asm_audio_client_free(struct audio_client *ac);
 int q6asm_write_async(struct audio_client *ac, uint32_t len, uint32_t msw_ts,
                       uint32_t lsw_ts, uint32_t flags);
 int q6asm_open_write(struct audio_client *ac, uint32_t format,
-                    uint16_t bits_per_sample);
+                    u32 codec_profile, uint16_t bits_per_sample);
 
 int q6asm_open_read(struct audio_client *ac, uint32_t format,
                     uint16_t bits_per_sample);