summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-10-27Merge branch 'LA.UM.9.12.C10.11.00.00.840.415' via branch ↵android-u-preview-1_r0.1android-msm-redbull-4.19-u-preview-1JohnnLee
'qcom-msm-4.19-7250-audio-drivers.lnx.4.0.r3' into android-msm-pixel-4.19 Bug: 253163588 Change-Id: Id8f721dfcc23ead6f4c6adc36a7b8471f3584aab Signed-off-by: JohnnLee <johnnlee@google.com>
2022-10-26Merge branch 'LA.UM.9.12.C10.11.00.00.840.415' via branch ↵Wilson Sung
'qcom-msm-4.19-7250-audio-drivers.lnx.4.0.r3' into android-msm-pixel-4.19 Change-Id: I9fada88babca9903940b66d51ce9e94cd0c8bcf7
2022-05-10asoc: codecs: Add nullptr checkShazmaan Ali
fix for nullptr deref issue Change-Id: I26acf2c5c696038c6d5c64d858174b2f2c58a7d3 Signed-off-by: Shazmaan Ali <quic_shazmaan@quicinc.com>
2022-03-25Merge branch 'LA.UM.9.12.C10.11.00.00.840.265' via branch ↵android-t-qpr3-beta-2_r0.2android-t-qpr3-beta-1_r0.2android-t-qpr2-beta-3_r0.2android-t-qpr2-beta-3.2_r0.3android-t-qpr2-beta-2_r0.2android-t-qpr2-beta-1_r0.3android-t-qpr1-beta-3_r0.1android-t-qpr1-beta-2_r0.3android-t-qpr1-beta-1_r0.2android-t-beta-4_r0.3android-t-beta-3_r0.3android-t-beta-3.3_r0.3android-t-beta-3.2_r0.3android-13.0.0_r0.72android-13.0.0_r0.67android-13.0.0_r0.62android-13.0.0_r0.57android-13.0.0_r0.52android-13.0.0_r0.47android-13.0.0_r0.42android-13.0.0_r0.3android-13.0.0_r0.18android-13.0.0_r0.13android-msm-redbull-4.19-t-qpr3-beta-2android-msm-redbull-4.19-t-qpr2-beta-3.2android-msm-redbull-4.19-t-qpr2-beta-1android-msm-redbull-4.19-t-qpr1-beta-2android-msm-redbull-4.19-t-beta-4android-msm-redbull-4.19-t-beta-3android-msm-redbull-4.19-android13-qpr3-beta1android-msm-redbull-4.19-android13-qpr2-betaandroid-msm-redbull-4.19-android13-qpr2android-msm-redbull-4.19-android13-qpr1-beta-3android-msm-redbull-4.19-android13-qpr1-betaandroid-msm-redbull-4.19-android13-qpr1android-msm-redbull-4.19-android13JohnnLee
'qcom-msm-4.19-7250' into android-msm-pixel-4.19 Bug: 223958127 Signed-off-by: JohnnLee <johnnlee@google.com> Change-Id: I8f0ea5df66808aad098a2da633f62ede0d8cc792
2022-01-31asoc: changes to fix KW errorsLakshman Chaluvaraju
Add changes to fix KW errors. Change-Id: I87fc8bf5b2753cef6af881713637e9521389708d Signed-off-by: Lakshman Chaluvaraju <quic_lchalu@quicinc.com>
2022-01-27Merge branch 'LA.UM.9.12.C10.11.00.00.840.201' via branch ↵android-t-beta-2_r0.3android-msm-redbull-4.19-t-beta-2JohnnLee
'qcom-msm-4.19-7250-audio-drivers.lnx.4.0.r3' into android-msm-pixel-4.19 Bug: 210578498 Signed-off-by: JohnnLee <johnnlee@google.com> Change-Id: I9ba8fa5ddf164cb72f578b4e2820a733ebf52516
2022-01-18Merge android-msm-pixel-4.19-sc-qpr3 into android-msm-pixel-4.19android-t-preview-2_r0.3android-t-beta-1_r0.3android-msm-redbull-4.19-t-preview-2android-msm-redbull-4.19-t-beta-1Lucas Wei
SBMerger: 410055097 Change-Id: I779faebb5351fc3eeebd5f6c09afbb98ebfe56b1 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> Signed-off-by: Lucas Wei <lucaswei@google.com>
2022-01-16Merge android-msm-barbet-4.19-sc-qpr3 into android-msm-pixel-4.19PixelBot AutoMerger
SBMerger: 410055097 Change-Id: Ie6dbecd41666345280346e33848e0e6b7c594071 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2022-01-16Merge android-msm-barbet-4.19-sc-v2 into android-msm-barbet-4.19-sc-qpr3android-s-qpr3-beta-3_r0.4android-s-qpr3-beta-2_r0.4android-s-qpr3-beta-1_r0.4android-12.1.0_r0.34android-12.1.0_r0.27android-msm-barbet-4.19-s-qpr3-beta-3android-msm-barbet-4.19-s-qpr3-beta-2android-msm-barbet-4.19-android12-qpr3PixelBot AutoMerger
SBMerger: 410055097 Change-Id: I6652548d397f3ece7171c9818b74a787f8d7adf1 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2022-01-16Merge android-msm-barbet-4.19-sc-qpr1 into android-msm-barbet-4.19-sc-v2android-12.1.0_r0.21android-12.1.0_r0.15android-msm-barbet-4.19-android12LPixelBot AutoMerger
SBMerger: 410055097 Change-Id: I5391cae04af7410dcc81eacfe0af07db013db78e Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2022-01-16Merge android-msm-pixel-4.19-sc-v2 into android-msm-pixel-4.19-sc-qpr3android-s-qpr3-beta-3_r0.3android-s-qpr3-beta-2_r0.3android-s-qpr3-beta-1_r0.3android-12.1.0_r0.33android-12.1.0_r0.26android-msm-redbull-4.19-s-qpr3-beta-3android-msm-redbull-4.19-s-qpr3-beta-2android-msm-redbull-4.19-android12-qpr3PixelBot AutoMerger
SBMerger: 410055097 Change-Id: I4b7c4b507445afd9f5bee23ee2fb7e8f728443ef Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2022-01-09Merge android-msm-pixel-4.19-sc-qpr1 into android-msm-pixel-4.19-sc-v2android-s-v2-beta-3_r0.4android-12.1.0_r0.4android-12.1.0_r0.20android-12.1.0_r0.14android-msm-redbull-4.19-s-v2-beta-3android-msm-redbull-4.19-android12LPixelBot AutoMerger
SBMerger: 410055097 Change-Id: Iab9a6c665744bb1534a4ae729feba2b43a4b850e Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2022-01-05Merge branch 'LA.UM.9.12.C10.11.00.00.840.201' into HEADWilson Sung
Change-Id: I81665aae9d704afcbcb3a969a67245508b2e31f9
2021-12-02Merge branch 'LA.UM.9.12.C10.11.00.00.840.150' into HEADWilson Sung
Change-Id: Iaa12e82b4f6b2ef4786dc4934d3df12b17679882
2021-11-24Merge branch 'android-msm-barbet-4.19-sc-security' into ↵android-12.0.0_r0.41android-12.0.0_r0.35android-msm-barbet-4.19-android12-qpr1Eva Huang
android-msm-barbet-4.19-sc-qpr1 Jan 2022.1 Bug: 204278602 Change-Id: If0896ff2c81f88271be9ac79679b62e13fac3fd9
2021-11-24Merge branch 'android-msm-pixel-4.19-sc-security' into ↵android-12.0.0_r0.40android-12.0.0_r0.34android-msm-redbull-4.19-android12-qpr1Eva Huang
android-msm-pixel-4.19-sc-qpr1 Jan 2022.1 Bug: 204278602 Change-Id: Id767184f62836ddb9e70edbdaadab6c2c0feab31
2021-11-24Asoc: check for invalid voice session idBubble Fang
Add check to return if session id is invalid. From 28a5f166422bf0b8b91dc348d02e62212ee0b261 Mon Sep 17 00:00:00 2001 From: Lakshman Chaluvaraju <lchalu@codeaurora.org> Date: Tue, 8 Jun 2021 10:43:20 +0530 Bug: 190503256 Signed-off-by: Bubble Fang <bubblefang@google.com> Change-Id: I2833f375e7c971d2006de3d0c3d0a05ccf535111 (cherry picked from commit 43667cf179dda119cb8e6224fff04511c4c0045d)
2021-11-16ASoC: wcd937x: Update EAR PA CnP FSM sequenceSoumya Managoli
EAR PA short switch is not released after PA is turned on and off. Address this hardware issue by updating the EAR PA CnP FSM while EAR power down sequence. Change-Id: If4269c30c13572db1b252f223368d444b9250901 Signed-off-by: Soumya Managoli <smanag@codeaurora.org>
2021-11-07Asoc: check for invalid voice session idBubble Fang
Add check to return if session id is invalid. From 28a5f166422bf0b8b91dc348d02e62212ee0b261 Mon Sep 17 00:00:00 2001 From: Lakshman Chaluvaraju <lchalu@codeaurora.org> Date: Tue, 8 Jun 2021 10:43:20 +0530 Bug: 190503256 Signed-off-by: Bubble Fang <bubblefang@google.com> Change-Id: I2833f375e7c971d2006de3d0c3d0a05ccf535111
2021-08-26Asoc: check for invalid voice session idLakshman Chaluvaraju
Add check to return if session id is invalid. Change-Id: Ida0e07b78657102a3bf6e73a1ca23c44ad112426 Signed-off-by: Lakshman Chaluvaraju <lchalu@codeaurora.org>
2021-08-12Merge "dsp: fix out of bound access for cal_data size"qctecmdr
2021-08-04audio: use codec_dai name to saperate codec settingandroid-t-preview-1_r0.3android-msm-redbull-4.19-t-preview-1vincenttew
use realtime codec_dai name to correct hw parameter flow because the config will mixed up CIRRUS and TI flow. Bug: 194766973 Test: build pass, playback/record pass on affected device Signed-off-by: vincenttew <vincenttew@google.com> Change-Id: I948643d976108876fa363972714d31fc10a22c08
2021-07-26Merge 'android-msm-barbet-4.19' into android-msm-pixel-4.19Lucas Wei
Bug: 194667419 Signed-off-by: Lucas Wei <lucaswei@google.com> Change-Id: I6ce5a4180292b85b304d1efe6440e4f52c37e93f
2021-07-06dsp: update size check for set/get VI param functionKunlei Zhang
In afe_set_cal_sp_th_vi_cfg and afe_get_cal_sp_th_vi_param functions, data size is not checked properly which might lead to out of bounds access. Add data_size check to avoid out of bounds access. Change-Id: Ibe049300c609d0d717309bccc65cac876ac075f7 Signed-off-by: Kunlei Zhang <kunleiz@codeaurora.org>
2021-07-06dsp: fix out of bound access for cal_data sizeKunlei Zhang
Add change to fix cal_data index out of bounds error. Change-Id: I8c8e62835e496c0f35fdc09757f4206c52020727 Signed-off-by: Kunlei Zhang <kunleiz@codeaurora.org>
2021-07-01asoc: codecs: retry for soundwire slave enumerationShashi Kant Maurya
Retry for soundwire slave enumeration during bootup before EPROBE_DEFER to avoid soundcard enumeration failures. Change-Id: I083ec76fc84a2b367f93a2dc166a1419a75ff8b4 Signed-off-by: Shashi Kant Maurya <smaury@codeaurora.org>
2021-06-22Merge android-msm-pixel-4.19 into android-msm-barbet-4.19android-s-v2-beta-3_r0.5android-s-v2-beta-2_r0.5android-s-v2-beta-1_r0.5android-s-beta-5_r0.6android-12.1.0_r0.5android-12.0.0_r0.7android-12.0.0_r0.25android-12.0.0_r0.15android-msm-barbet-4.19-s-v2-beta-3android-msm-barbet-4.19-s-v2-beta-1android-msm-barbet-4.19-s-beta-5android-msm-barbet-4.19-android12-v2-beta-2android-msm-barbet-4.19-android12Lucas Wei
Bug: 187909050 Signed-off-by: Lucas Wei <lucaswei@google.com> Change-Id: I5355253bce3b7c945ea75f94f24d22ec601dacf5
2021-06-22Merge LA.UM.9.12.C10.11.00.00.840.010 via branch ↵android-s-v2-beta-2_r0.4android-s-v2-beta-1_r0.4android-s-beta-5_r0.5android-s-beta-4_r0.5android-12.0.0_r0.6android-12.0.0_r0.24android-12.0.0_r0.14android-msm-redbull-4.19-s-beta-5android-msm-redbull-4.19-s-beta-4android-msm-redbull-4.19-android12-v2-beta-2android-msm-redbull-4.19-android12android-msm-redbull--s-v2-beta-1Lucas Wei
'qcom-msm-4.19-7250-audio-drivers.lnx.4.0.r3' into android-msm-pixel-4.19 Conflicts: dsp/q6adm.c dsp/rtac.c include/dsp/q6adm-v2.h Bug: 187909050 Signed-off-by: Lucas Wei <lucaswei@google.com> Change-Id: I9261f1c48a33410da347a0ed29da4b93d4ec0ec9
2021-06-21soc: add check condition before enabling irqJason Hsu
Enable interrupt request only when the interrupt is in disabled state. Bug: 187655844 Signed-off-by: Jason Hsu <jasonchhsu@google.com> Change-Id: I18d32113be7b81d5ea120bd7fd696474efd5229d
2021-06-17asoc: codec: Playback Amp power up/down time optimization.vijeth.po
In-order reduce the power down and hence to improve audio-server restart time following time optimization is done. 1. Add common delay after both Amp is powered down. a. Use 16ms instead of 20ms 2. Remove extra delay added in tas256x_set_power_shutdown() 3. Use usleep_range() instead of msleep for less than 20ms in power up/down related functions. Bug: 171941028 Signed-off-by: vincenttew <vincenttew@google.com> Change-Id: I9d169b73f140c0b6b65d4f035193e3f687624aaa
2021-06-16Merge branch 'android-msm-barbet-4.19-rvc' into android-msm-barbet-4.19Lucas Wei
Change-Id: Ia2fddd6b1983f7a496fdb494397016638e661623 Signed-off-by: Lucas Wei <lucaswei@google.com>
2021-06-07Merge remote-tracking branch 'android-msm-barbet-4.19-rvc-security' into ↵android-11.0.0_r0.116android-11.0.0_r0.106android-msm-barbet-4.19-android11-d2achigoliu
android-msm-barbet-4.19-rvc Aug 2021.1 Bug: 189715888 Bug: 189715042 Change-Id: I3798f624b84783365dddcbeb89dc9cdafc267736
2021-06-07Merge remote-tracking branch 'android-msm-pixel-4.19-rvc-security' into ↵achigoliu
android-msm-barbet-4.19-rvc-security Bug: 189715042 Change-Id: I48ea48ce48b6bcfd40dfb89545a64bcc5443d88c
2021-06-07Merge branch 'android-msm-pixel-4.19-rvc-qpr3' into android-msm-pixel-4.19android-s-beta-3_r0.5android-msm-redbull-4.19-s-beta-3Lucas Wei
Change-Id: I5c2d11ab5e5fd04cb4a6cef1cfe18b2877c99ff6 Signed-off-by: Lucas Wei <lucaswei@google.com>
2021-06-03Merge branch 'android-msm-pixel-4.19-rvc-security' into ↵android-11.0.0_r0.115android-11.0.0_r0.105android-11.0.0_r0.100android-msm-redbull-4.19-android11-qpr3Eva Huang
android-msm-pixel-4.19-rvc-qpr3 Aug 2021.1 Bug: 189715888 Change-Id: Ic5e1225a3932b92943fe5fbaea2d363efd776725
2021-05-18Merge branch 'LA.UM.9.12.C10.11.00.00.840.010' into ↵Wilson Sung
qcom-msm-4.19-7250-audio-drivers.lnx.4.0.r3 Change-Id: I5401782d473b0b04922bd526d2b69e40565d7b51
2021-05-10dsp: Feedback path cfg to support 3rd party spkr protection algorithms.Vangala, Amarnath
Backward compatibility change to set 'feedback path cfg' to AFE_MODULE_FEEDBACK, to support 3rd party spkr protection algorithms. Change-Id: I9af731902fbc5bc69f130a4f30d8fc5f18ceaace Signed-off-by: Vangala, Amarnath <avangala@codeaurora.org>
2021-05-03Merge branch android-msm-pixel-4.19 into android-msm-barbet-4.19JohnnLee
Conflicts: asoc/codecs/Kbuild dsp/q6afe.c Bug: 184813985 Change-Id: I1ac7afebff5a637726ed6770cf4e4e3fc0fa59ac
2021-04-21Merge branch 'LA.UM.9.12.R1.11.00.00.597.108' via branch ↵JohnnLee
'qcom-msm-4.19-7250-audio-drivers.lnx.4.0.r3' into android-msm-pixel-4.19 Conflicts: asoc/kona.c Bug: 182748782 Change-Id: I3a9dffa6dd350b5a6b240e50c7e94eebb8b31243
2021-04-16audio: sound trigger new PCM for zero-latency recordingandroid-s-beta-2_r0.5android-msm-redbull-4.19-s-beta-2yixuanjiang
Create new PCM to capture hotword buffer for zeroy latency Bug: 184006297 Signed-off-by: yixuanjiang <yixuanjiang@google.com> Change-Id: I3101302d980ebeab69f7040c7dcd17126b582041
2021-04-15audio: sound trigger new PCM for zero-latency recordingyixuanjiang
Create new PCM to capture hotword buffer for zeroy latency Bug: 184006297 Signed-off-by: yixuanjiang <yixuanjiang@google.com> Change-Id: I3101302d980ebeab69f7040c7dcd17126b582041
2021-04-13Merge "ASoC: dsp: Synchronise adm commands"qctecmdr
2021-04-04Merge android-msm-barbet-4.19-rvc into android-msm-barbet-4.19PixelBot AutoMerger
SBMerger: 351186807 Change-Id: If80ee87e5ce4556d86e1cbbba963a35711715b85 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2021-03-26asoc: codecs: fix race condition of core vote and reg accessVangala, Amarnath
Auto suspend timer for core vote is triggering before read write complete. Move the auto suspend of core vote to post read write operation. Change-Id: Ib0f6b026fe0e7fd3fbe052691db492915e436a78 Signed-off-by: Vangala, Amarnath <avangala@codeaurora.org>
2021-03-22ASoC: dsp: Synchronise adm and rtac commandsandroid-s-beta-1_r0.5android-msm-redbull-4.19-s-beta-1android-msm-redbull--s-beta-1Soumya Managoli
Race condition observed while processing the set_pp_params command responses sent back to back by adsp for commands sent from adm and rtac. Handle this by synchronising the get/set pp_params command in both the drivers. QCT CR-2771103 Bug: 181819518 Change-Id: Id89d98217dc5cad3703e5d545ddee21cb145c874 Signed-off-by: Soumya Managoli <smanag@codeaurora.org>
2021-03-22ASoC: dsp: Synchronise adm and rtac commandsandroid-11.0.0_r0.110Soumya Managoli
Race condition observed while processing the set_pp_params command responses sent back to back by adsp for commands sent from adm and rtac. Handle this by synchronising the get/set pp_params command in both the drivers. QCT CR-2771103 Bug: 181819518 Change-Id: Id89d98217dc5cad3703e5d545ddee21cb145c874 Signed-off-by: Soumya Managoli <smanag@codeaurora.org>
2021-03-22ASoC: dsp: Synchronise adm commandsSoumya Managoli
Race condition observed while processing the get/set_pp_params and adm_close command. Synchronise adm open, close and get/set_pp_params by sending the apr cmd pkt using the same lock. Change-Id: I9a1ebcedc91f78f3940846688f8569ec9088e1e7 Signed-off-by: Soumya Managoli <smanag@codeaurora.org>
2021-03-21Merge "dsp: update size check for get VI param function"qctecmdr
2021-03-19Merge branch LA.UM.9.12.R1.11.00.00.597.108 into ↵Wilson Sung
qcom-msm-4.19-7250-audio-drivers.lnx.4.0.r3 Change-Id: I0cef4ccfb5e280c4c21009fa9d1ea7f2ad7d2637
2021-03-17dsp: adm: add to check output/input channelShashi Kant Maurya
To avoid out of bound value of output/input channel add the check. Change-Id: I25b7616d6fc08c2d0bb530dfb1457471dc25861c Signed-off-by: Shashi Kant Maurya <smaury@codeaurora.org> Signed-off-by: Lakshman Chaluvaraju <lchalu@codeaurora.org>