diff options
| author | Asish Bhattacharya <asishb@codeaurora.org> | 2017-08-08 12:55:01 +0530 |
|---|---|---|
| committer | Martin Fick <mfick@codeaurora.org> | 2017-08-18 16:56:12 -0600 |
| commit | 34504581a0a6ed64b2f342867432f9628b48f0a9 (patch) | |
| tree | cc5273cc1e036fd3e4a499da452e85594629914f /dsp | |
| parent | 71ca58e195db0752381aa16ea07352de7a37fd08 (diff) | |
| download | msm-extra-34504581a0a6ed64b2f342867432f9628b48f0a9.tar.gz | |
audio-lnx: Add snapshot of audio drivers from below commit.
(1996ec83a45: "ARM: dts: msm: Reduce CNOC bus voting for
USB slave on SDM845")
This change is to migrate latest snapshot of kernel drivers.
Change-Id: I84669db544773d3ce9d2d5dff0ab6943bd7d8ff9
Signed-off-by: Asish Bhattacharya <asishb@codeaurora.org>
Diffstat (limited to 'dsp')
| -rw-r--r-- | dsp/q6adm.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/dsp/q6adm.c b/dsp/q6adm.c index 19151139..bc217237 100644 --- a/dsp/q6adm.c +++ b/dsp/q6adm.c @@ -2388,7 +2388,8 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology, struct adm_cmd_device_open_v5 open; struct adm_cmd_device_open_v6 open_v6; int ret = 0; - int port_idx, copp_idx, flags; + int port_idx, flags; + int copp_idx = -1; int tmp_port = q6audio_get_port_id(port_id); pr_debug("%s:port %#x path:%d rate:%d mode:%d perf_mode:%d,topo_id %d\n", @@ -2442,8 +2443,17 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology, (topology == VPM_TX_DM_RFECNS_COPP_TOPOLOGY)) rate = 16000; - copp_idx = adm_get_idx_if_copp_exists(port_idx, topology, perf_mode, - rate, bit_width, app_type); + /* + * Routing driver reuses the same adm for streams with the same + * app_type, sample_rate etc. + * This isn't allowed for ULL streams as per the DSP interface + */ + if (perf_mode != ULTRA_LOW_LATENCY_PCM_MODE) + copp_idx = adm_get_idx_if_copp_exists(port_idx, topology, + perf_mode, + rate, bit_width, + app_type); + if (copp_idx < 0) { copp_idx = adm_get_next_available_copp(port_idx); if (copp_idx >= MAX_COPPS_PER_PORT) { |