Commit graph

944 commits

Author SHA1 Message Date
Linux Build Service Account
662dec1e1e Merge "config: sm6150: Enable compilation of snd_event" 2018-09-27 05:31:53 -07:00
Linux Build Service Account
ea24d6da52 Merge "asoc: sm6150: Add support for audio over display port" 2018-09-26 21:37:09 -07:00
Linux Build Service Account
eaf72d3218 Merge "asoc: fix routing error during switch from non-adm to adm path" 2018-09-26 21:37:07 -07:00
Linux Build Service Account
e5b3489f2f Merge "asoc: sm6150: Add SND event FWK support for talos" 2018-09-26 21:37:01 -07:00
Linux Build Service Account
649cf8acaa Merge "asoc: wcd934x: add SSR events to trigger to new swr master controller" 2018-09-26 21:37:00 -07:00
Linux Build Service Account
a984bd8837 Merge "asoc: sm6150: Add proper checks for ch_num" 2018-09-25 19:17:44 -07:00
Dhananjay Kumar
3d8cc2ed33 asoc: fix routing error during switch from non-adm to adm path
Fix routing error from incorrect usage of passthrough mode
while switching LSM session from direct AFE connection to
path using ADM before AFE connection.
Issue is due to loss of passthrough mode for an FE not opened
with ADM during initial session setup or while moving the FE
from one BE port to another BE port, i.e. device switch usecases.
Since passthrough mode for an FE is supposed to be same for all
the BEs connecting to the FE and is directly decided from FE
driver having single value, decouple passthrough mode from BE
and store the required mode in an FE config independent of BE usage.
This allows storing passthrough mode for future usage irrespective
of initial setup path which can be with or without ADM.

Change-Id: I53106b49effd9b267363aedd77477eed103b317c
Signed-off-by: Dhananjay Kumar <dhakumar@codeaurora.org>
2018-09-25 15:34:41 +05:30
Rohit kumar
27138766db config: sm6150: Enable compilation of snd_event
Enable compilation of snd_event driver for sm6150.

Change-Id: Ia6c62fea8d3660e187e79d1743a1b6862f3dd228
Signed-off-by: Rohit kumar <rohitkr@codeaurora.org>
2018-09-25 12:20:20 +05:30
Vaishnavi Kommaraju
9a3d5ebc7c asoc: sm6150: Add SND event FWK support for talos
Add snd_event support for talos required for SSR.

Change-Id: If689d9cda131324b99e0dda0b91f237b495eeadc
Signed-off-by: Vaishnavi Kommaraju <vkommara@codeaurora.org>
2018-09-25 12:00:13 +05:30
Laxminath Kasam
1aab2c064a asoc: wcd937x: add SSR changes for wcd937x codec driver
Add changes to recover audio after SSR on wcd937x driver.

Change-Id: I661605e9b1bd71f08f331d14ae52f89ba8423d4f
Signed-off-by: Rohit kumar <rohitkr@codeaurora.org>
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2018-09-25 11:59:29 +05:30
Laxminath Kasam
fb0d683b37 asoc: bolero: add SSR changes support on bolero codec
Add changes for audio SSR and PDR on bolero codec
and respective macro drivers.

Change-Id: I146de15022cebb788ccb52ed6b8ab85b7cba2ba0
Signed-off-by: Vaishnavi Kommaraju <vkommara@codeaurora.org>
Signed-off-by: Rohit kumar <rohitkr@codeaurora.org>
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2018-09-25 11:57:49 +05:30
Laxminath Kasam
27b1bbc54b soc: pinctrl-lpi: add SSR changes based on snd event fwk
Add changes to support SSR in pinctrl lpi driver
based on snd event framework.

Change-Id: If4fb3085ab69ae04628ef10a8b528d0cdc20f40d
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2018-09-25 11:36:27 +05:30
Laxminath Kasam
d7262ae1e0 asoc: wcd934x: add SSR events to trigger to new swr master controller
For new swr master controller to recover WSA on wcd934x variant,
trigger events from wcd934x driver for ssr down and up.

Change-Id: I8f0163178708760ef3ad2a765a80682611693e9b
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2018-09-25 11:35:35 +05:30
Laxminath Kasam
1df09a82e5 soc: add SSR changes for swr mstr controller
Add changes to recover audio during SSR and PDR
in swr master controller driver.

Change-Id: Ibe3ae097b5f9d59b135d861c5f50f6bbc1c05af6
Signed-off-by: Rohit kumar <rohitkr@codeaurora.org>
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2018-09-25 11:32:40 +05:30
Ramprasad Katkam
7cb4ff6b65 soc: swr-mstr: Use single pm runtime call during port enable
Add changes to call pm runtime calls only once for soundwire
master active, to be able to decrement and put to suspend
during SSR.

Change-Id: I068040e2a224d1ee97f472f69f25af77ae632be2
Signed-off-by: Ramprasad Katkam <katkam@codeaurora.org>
2018-09-25 11:32:16 +05:30
Laxminath Kasam
497a651ef8 asoc: codecs: Add parent child relation for bolero and tanggu
In bolero and tanggu combination, make bolero parent of tanggu.
Bolero and tanggu can communicate mutually using notifier and
plat_data callback APIs.

Change-Id: Iecd119df7f0ad1ba225c0427f3f42f217146b092
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2018-09-25 11:31:37 +05:30
Linux Build Service Account
53f339b53b Merge "asoc: codecs: Add proper null checks and initialize variables" 2018-09-24 19:22:03 -07:00
Rohit kumar
e5a1d4f094 asoc: sm6150: Add support for audio over display port
Fix condition to register display port dai link as
part of soundcard registration.

CRs-Fixed: 2321275
Change-Id: I196163599299fa4aea21c930c0bfe3f8e5425223
Signed-off-by: Rohit kumar <rohitkr@codeaurora.org>
Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
2018-09-24 18:36:50 +05:30
Aditya Bavanari
4f3d5643bd asoc: codecs: Add support for BCL feature
Add mixer widgets, routing and mixer controls in order
to support BCL feature on WSA and RX macros
of bolero codec.

CRs-Fixed: 2225097
Change-Id: I463f89a517bb3878e51a6aca0c1d73bc652ab8c5
Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
2018-09-23 08:38:00 +05:30
Gerrit - the friendly Code Review server
965e8d4b00 Merge changes into audio-drivers.lnx.3.0 2018-09-21 08:34:00 -07:00
Linux Build Service Account
7d2fdc9f05 Merge "ASoC: wcd934x: check sound card state to avoid pointer dereference" 2018-09-21 08:30:42 -07:00
Linux Build Service Account
1562ec4f76 Merge "asoc: wcd937x: add support for disable HPH compander" 2018-09-21 08:30:40 -07:00
Linux Build Service Account
8903e56097 Merge "ASoC: rate limit for error log" 2018-09-20 11:43:44 -07:00
Linux Build Service Account
884e5ee2e5 Merge "ASoC: wcd937x: Reduce latency in case of impedance detection" 2018-09-19 22:52:46 -07:00
Tanya Dixit
d85e6f3384 asoc: sm6150: Add proper checks for ch_num
Check the value of ch_num and return if
less than zero to avoid out of bound access
in cdc_dma_cfg arrays.

Change-Id: Ie59f5e7ed063d65a61033a142acd2bcf2287c39b
Signed-off-by: Tanya Dixit <tdixit@codeaurora.org>
2018-09-19 15:26:04 +05:30
Linux Build Service Account
c223ed77f3 Merge "dsp: q6lsm: Avoid null pointer access in SSR" 2018-09-18 22:27:35 -07:00
Xiaojun Sang
c226e86c15 ASoC: rate limit for error log
Use rate limit to reduce redundant log.

Change-Id: I7cd7403c42ddce7915c5ecb82504e6c38bcf0572
Signed-off-by: Xiaojun Sang <xsang@codeaurora.org>
2018-09-19 08:53:45 +08:00
Laxminath Kasam
33367f849a asoc: wcd937x: add support for disable HPH compander
On wcd937x, add controls for HPH compander.
Handle sequences for headphone path based on
compander enabled or disabled.

Change-Id: I2ebdd03a4f79dc6156327d0613fab2f26710393f
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2018-09-18 20:55:25 +05:30
Meng Wang
567bcd3b7a ASoC: wcd934x: check sound card state to avoid pointer dereference
When codec probe is not correctly completed and ADSP SSR happens
before sound card is registered, calling SSR callback may result
into NULL pointer dereference and kernel panic happens.
Check sound card state when calling device_down and post_reset to
avoid NULL pointer dereference.

Change-Id: I35fd84af51edf45db6fd451dc68dbcaaed11fee7
Signed-off-by: Meng Wang <mengw@codeaurora.org>
2018-09-18 15:33:31 +08:00
Linux Build Service Account
24eb5b4c0b Merge "ASoC: wcd937x: Add alias for in2p clamp register" 2018-09-17 20:47:31 -07:00
Linux Build Service Account
56cc7dbdf1 Merge "dsp: asm: split check condition for NULL and stale" 2018-09-17 20:47:29 -07:00
Vatsal Bucha
34b5181903 ASoC: wcd937x: Reduce latency in case of impedance detection
Bulk read api does not work properly for swr regmap,
causing failure/delay in impedance detection.
Use regmap read api to avoid the issue.

CRs-Fixed: 2301798
Change-Id: I5727cfcb7846f40f5b0f75b7976b492e2a2bfde0
Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2018-09-17 19:20:54 +05:30
Tanya Dixit
8530fb9b5d asoc: codecs: Add proper null checks and initialize variables
Add proper null checks and initialize variables
in rx-macro, tx-macro, va-macro and wcd937x drivers.

Change-Id: I90899c84d3391305b9a24d4b043adc08b7c0332a
Signed-off-by: Tanya Dixit <tdixit@codeaurora.org>
2018-09-17 06:25:33 -07:00
Gerrit - the friendly Code Review server
54179d2aca Merge changes into audio-drivers.lnx.3.0 2018-09-17 05:18:35 -07:00
Linux Build Service Account
4c5c88d4f3 Merge "asoc: bolero: add support for native playback" 2018-09-17 05:14:38 -07:00
Linux Build Service Account
5b663c71f0 Merge "asoc: codecs: add missing mbhc register for wcd9335" 2018-09-17 05:14:37 -07:00
Linux Build Service Account
f4f71439c4 Merge "dsp: add support for mic break detection" 2018-09-17 05:14:36 -07:00
Linux Build Service Account
bae047aa0f Merge "ASoC: codecs: Fix slim_tx port configuration for wcd9335" 2018-09-17 05:14:34 -07:00
Linux Build Service Account
bf14da227b Merge "asoc: return when memory allocation fails" 2018-09-17 05:14:33 -07:00
Linux Build Service Account
a00e61e272 Merge "ASoC: msm: remove unnecessary error log in audio kernel" 2018-09-17 05:14:31 -07:00
Laxminath Kasam
9c09cbdbb5 dsp: q6lsm: Avoid null pointer access in SSR
Synchronize both contexts of SSR and SVA close
to avoid access of client handle after free.
Check whether the client is valid or not when
retrieved from private data in q6lsm_callback along
with NULL check to avoid invalidated pointer access.

Change-Id: I51c13cd79fd947c624bf0cade4c93a3fdf07353e
Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
2018-09-17 14:33:57 +05:30
Vignesh Kulothungan
e5159cdc90 dsp: asm: split check condition for NULL and stale
Split the muli-check condition into two separate check conditions.
Suppress the logs for stale condition to debug.

CRs-Fixed: 2307741
Change-Id: I984a2ea7928de052e993e77db807df83109ab423
Signed-off-by: Vignesh Kulothungan <vigneshk@codeaurora.org>
2018-09-12 11:23:34 -07:00
Laxminath Kasam
ac396d5734 asoc: bolero: add support for native playback
On bolero rx macro, add support to switch
mclk frequency based on native usecase active.

Change-Id: I2f915475dcfdadf1027507b7ed83a4a852ece1c7
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2018-09-12 11:39:32 +05:30
Xiaojun Sang
f27e351051 ASoC: msm: remove unnecessary error log in audio kernel
PP event queue is not used by capture path. Initialize PP
event queue for playback path only to remove unnecessary log.
Change log level from error to debug when no matching afe
cal block is found.

Change-Id: Ibc323449f2fdc74cccd350ae30ac76d937898ffa
Signed-off-by: Xiaojun Sang <xsang@codeaurora.org>
2018-09-11 18:03:19 -07:00
Laxminath Kasam
b0f27cd9f0 soc: swr-mstr: add changes to support native playback
For MCLK frequency switching to 11.2896 for native
playback support, frameshape also needs to be changed
accordingly. Add changes to support frameshape switch
based on mclk frequency for given master.

Change-Id: I0c4dd69b743f83b45eeed73f27ad10e878b9244b
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2018-09-11 15:52:47 +05:30
Tanya Dixit
f6ecc2a139 rtac: Add mutex lock to ensure proper fops access
Add mutex lock in rtac_open and rtac_release
to avoid usage count discrepancies leading
to multiple calls to unmap memory resulting in
null pointer dereference.

CRs-Fixed: 2271712
Change-Id: Ie6da28837c352030b8d7e377d68a70cf04e7072a
Signed-off-by: Tanya Dixit <tdixit@codeaurora.org>
2018-09-11 03:11:56 -07:00
Vaishnavi Kommaraju
3b0d43d89e ASoC: codecs: Fix slim_tx port configuration for wcd9335
Add check for valid dai_id in slim_tx_mixer_put().

Change-Id: Ic231c81c2cba02ad25fc07783169601dedd352c0
Signed-off-by: Vaishnavi Kommaraju <vkommara@codeaurora.org>
2018-09-11 00:49:00 -07:00
Linux Build Service Account
186f847814 Merge "dsp: Do not send ABR parameters if bitrate is fixed" 2018-09-10 21:36:39 -07:00
Linux Build Service Account
d47af53b2f Merge "dsp: updates to MDF for enabling access control" 2018-09-10 21:36:35 -07:00
Vatsal Bucha
9bdadace52 ASoC: wcd937x: Add alias for in2p clamp register
Add alias for in2p clamp register to check in2p
clamp state in insertion irq and ignore the interrupt
if the clamp is already set.

Change-Id: Ibd4ff2cef8690894a01072e74ce130f824656f5d
Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2018-09-10 15:24:00 +05:30