From 0e1992003d490036ff478bf59a6da1b1ecccee97 Mon Sep 17 00:00:00 2001 From: Hexuan Zhu Date: Wed, 15 Dec 2021 07:51:45 +0800 Subject: [PATCH 1/5] audio-kernel: change the maxnum for stream in QACT Increase the max num for QACT stream, should merge together with 3931333 Change-Id: I4bdd9589be6821f7a44f8c89570b811b6fc03786 Signed-off-by: Hexuan Zhu --- include/dsp/rtac.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 100755 include/dsp/rtac.h diff --git a/include/dsp/rtac.h b/include/dsp/rtac.h old mode 100644 new mode 100755 index 7b047a34a95b..68d6c1b1ab4c --- a/include/dsp/rtac.h +++ b/include/dsp/rtac.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2011, 2013-2015, 2017-2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef __RTAC_H__ @@ -13,7 +14,7 @@ #define RTAC_CVS 1 #define RTAC_VOICE_MODES 2 -#define RTAC_MAX_ACTIVE_DEVICES 6 +#define RTAC_MAX_ACTIVE_DEVICES 15 #define RTAC_MAX_ACTIVE_POPP 8 #define DEFAULT_APP_TYPE 0x00011130 From 092ce1cc5c37b63a30dc01338c435c8fe8c7d21f Mon Sep 17 00:00:00 2001 From: Soumya Managoli Date: Tue, 28 Dec 2021 16:09:05 +0530 Subject: [PATCH 2/5] ASoC: Unmap lab buffer during listen session close Ensure lab buffer de-alloc even if listen session is not in start state to avoid memory leak when multiple listen clients are created. Change-Id: Id6d8b37a3dcdf49618ae2a4d80903d429393cd8e Signed-off-by: Soumya Managoli --- asoc/msm-lsm-client.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/asoc/msm-lsm-client.c b/asoc/msm-lsm-client.c index fe461ffc5e5a..69768bc38e51 100644 --- a/asoc/msm-lsm-client.c +++ b/asoc/msm-lsm-client.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2013-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. */ #include #include @@ -3092,14 +3093,6 @@ static int msm_lsm_close(struct snd_pcm_substream *substream) __func__, ret); prtd->lsm_client->lab_started = false; } - if (prtd->lsm_client->lab_buffer) { - ret = msm_lsm_lab_buffer_alloc(prtd, - LAB_BUFFER_DEALLOC); - if (ret) - dev_err(rtd->dev, - "%s: lab buffer dealloc failed ret %d\n", - __func__, ret); - } } if (!atomic_read(&prtd->read_abort)) { @@ -3120,6 +3113,15 @@ static int msm_lsm_close(struct snd_pcm_substream *substream) prtd->lsm_client->started = false; } + if (prtd->lsm_client->lab_enable && prtd->lsm_client->lab_buffer) { + ret = msm_lsm_lab_buffer_alloc(prtd, + LAB_BUFFER_DEALLOC); + if (ret) + dev_err(rtd->dev, + "%s: lab buffer dealloc failed ret %d\n", + __func__, ret); + } + /* * De-register existing sound models * to free SM and CAL buffer, even if From 5147ab5a87242d9355037e2d3901a8d4412212c8 Mon Sep 17 00:00:00 2001 From: Soumya Managoli Date: Mon, 24 Jan 2022 13:45:17 +0530 Subject: [PATCH 3/5] dsp: Update adsp packet timeout in voice drv Change TIMEOUT_MS from 300 to 1000 msec in q6voice drv. Change-Id: I383380dfbb5334a32c5c939a67606612344170ee Signed-off-by: Soumya Managoli --- dsp/q6voice.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dsp/q6voice.c b/dsp/q6voice.c index 45753c0381e7..433c2bdb2b0e 100644 --- a/dsp/q6voice.c +++ b/dsp/q6voice.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2012-2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. */ #include #include @@ -25,7 +26,7 @@ #include #include -#define TIMEOUT_MS 300 +#define TIMEOUT_MS 1000 #define CMD_STATUS_SUCCESS 0 From f72f1bcfdaf86527e803fc784a9e828f015c0a83 Mon Sep 17 00:00:00 2001 From: E V Ravi Date: Tue, 4 Jan 2022 14:35:42 +0530 Subject: [PATCH 4/5] ASoC : add support for MultiMedia17 Support for MultiMedia17 to be used with TERT_TDM_TX_0 Change-Id: Id98a1a206f8beac79bc00972e72a158064365d0a Signed-off-by: E V Ravi --- asoc/msm-pcm-routing-v2.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/asoc/msm-pcm-routing-v2.c b/asoc/msm-pcm-routing-v2.c index 6915f566cd29..f2a9ba603fe8 100755 --- a/asoc/msm-pcm-routing-v2.c +++ b/asoc/msm-pcm-routing-v2.c @@ -26487,6 +26487,10 @@ static const struct snd_kcontrol_new mmul17_mixer_controls[] = { MSM_BACKEND_DAI_USB_TX, MSM_FRONTEND_DAI_MULTIMEDIA17, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), + SOC_DOUBLE_EXT("TERT_TDM_TX_0", SND_SOC_NOPM, + MSM_BACKEND_DAI_TERT_TDM_TX_0, + MSM_FRONTEND_DAI_MULTIMEDIA17, 1, 0, msm_routing_get_audio_mixer, + msm_routing_put_audio_mixer), }; static const struct snd_kcontrol_new mmul18_mixer_controls[] = { @@ -38392,6 +38396,8 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"MultiMedia10 Mixer", "QUAT_TDM_TX_2", "QUAT_TDM_TX_2"}, {"MultiMedia10 Mixer", "QUAT_TDM_TX_3", "QUAT_TDM_TX_3"}, + {"MultiMedia17 Mixer", "TERT_TDM_TX_0", "TERT_TDM_TX_0"}, + {"MultiMedia20 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"}, {"MultiMedia20 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"}, {"MultiMedia20 Mixer", "PRI_TDM_TX_2", "PRI_TDM_TX_2"}, From 47e815e52b52afe704d217bece1e15f05bed8336 Mon Sep 17 00:00:00 2001 From: Deru Wang Date: Tue, 25 Jan 2022 14:50:25 +0800 Subject: [PATCH 5/5] asoc: copyright fix Revert LF copyright and add QUIC copyright for change 3943882 Change-Id: I986ff4a667c653c5b8870e98655d9578d0fccf0b Signed-off-by: Deru Wang --- asoc/msm-dai-q6-v2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/asoc/msm-dai-q6-v2.c b/asoc/msm-dai-q6-v2.c index 70ab355ac3c0..ceba2e0ac11c 100755 --- a/asoc/msm-dai-q6-v2.c +++ b/asoc/msm-dai-q6-v2.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only -/* Copyright (c) 2012-2022, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. */ #include