From 9fb7c8c43eefc5f44725049995a38337da10b8f6 Mon Sep 17 00:00:00 2001 From: Dieter Luecking Date: Wed, 6 Mar 2019 13:31:09 +0100 Subject: [PATCH] dsp: Revert featurization of 32 channel support in DSP Remove the dependency on dedicated config flag for the use of new API versions in ASM and ADM open commands. Dependency is now on ADSP service version only. Change-Id: I2e7bcec675bafb9ad9e2a10df4ccc1e52bb72c92 Signed-off-by: Dieter Luecking --- asoc/msm-pcm-q6-v2.c | 12 ++++-------- dsp/q6adm.c | 3 +-- include/dsp/q6core.h | 14 +------------- 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/asoc/msm-pcm-q6-v2.c b/asoc/msm-pcm-q6-v2.c index af158432630f..b20ec9a23677 100644 --- a/asoc/msm-pcm-q6-v2.c +++ b/asoc/msm-pcm-q6-v2.c @@ -390,8 +390,7 @@ static int msm_pcm_playback_prepare(struct snd_pcm_substream *substream) } else { if ((q6core_get_avcs_api_version_per_service( APRV2_IDS_SERVICE_ID_ADSP_ASM_V) >= - ADSP_ASM_API_VERSION_V2) && - q6core_use_Q6_32ch_support()) + ADSP_ASM_API_VERSION_V2)) ret = q6asm_open_write_v5(prtd->audio_client, fmt_type, bits_per_sample); else @@ -439,8 +438,7 @@ static int msm_pcm_playback_prepare(struct snd_pcm_substream *substream) if ((q6core_get_avcs_api_version_per_service( APRV2_IDS_SERVICE_ID_ADSP_ASM_V) >= - ADSP_ASM_API_VERSION_V2) && - q6core_use_Q6_32ch_support()) { + ADSP_ASM_API_VERSION_V2)) { ret = q6asm_media_format_block_multi_ch_pcm_v5( prtd->audio_client, runtime->rate, @@ -523,8 +521,7 @@ static int msm_pcm_capture_prepare(struct snd_pcm_substream *substream) if ((q6core_get_avcs_api_version_per_service( APRV2_IDS_SERVICE_ID_ADSP_ASM_V) >= - ADSP_ASM_API_VERSION_V2) && - q6core_use_Q6_32ch_support()) + ADSP_ASM_API_VERSION_V2)) ret = q6asm_open_read_v5(prtd->audio_client, FORMAT_LINEAR_PCM, bits_per_sample, false, ENC_CFG_ID_NONE); @@ -601,8 +598,7 @@ static int msm_pcm_capture_prepare(struct snd_pcm_substream *substream) if ((q6core_get_avcs_api_version_per_service( APRV2_IDS_SERVICE_ID_ADSP_ASM_V) >= - ADSP_ASM_API_VERSION_V2) && - q6core_use_Q6_32ch_support()) + ADSP_ASM_API_VERSION_V2)) ret = q6asm_enc_cfg_blk_pcm_format_support_v5( prtd->audio_client, prtd->samp_rate, diff --git a/dsp/q6adm.c b/dsp/q6adm.c index a265b7be2494..06cb558a85f3 100644 --- a/dsp/q6adm.c +++ b/dsp/q6adm.c @@ -3062,8 +3062,7 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology, if ((q6core_get_avcs_api_version_per_service( APRV2_IDS_SERVICE_ID_ADSP_ADM_V) >= - ADSP_ADM_API_VERSION_V3) && - q6core_use_Q6_32ch_support()) { + ADSP_ADM_API_VERSION_V3)) { memset(&open_v8, 0, sizeof(open_v8)); memset(&ep1_payload, 0, sizeof(ep1_payload)); memset(&ep2_payload, 0, sizeof(ep2_payload)); diff --git a/include/dsp/q6core.h b/include/dsp/q6core.h index 61bede7f99d1..61fe6ba95fa9 100644 --- a/include/dsp/q6core.h +++ b/include/dsp/q6core.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved. */ #ifndef __Q6CORE_H__ @@ -306,16 +306,4 @@ int q6core_destroy_lpass_npa_client(uint32_t client_handle); int q6core_request_island_transition(uint32_t client_handle, uint32_t island_allow_mode); -#if IS_ENABLED(CONFIG_USE_Q6_32CH_SUPPORT) -static inline bool q6core_use_Q6_32ch_support(void) -{ - return true; -} -#else -static inline bool q6core_use_Q6_32ch_support(void) -{ - return false; -} -#endif - #endif /* __Q6CORE_H__ */