Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e360832e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "dsp: Revert featurization of 32 channel support in DSP"

parents 5b4faffb 9fb7c8c4

asoc/msm-pcm-q6-v2.c

+4 −8
Original line number Diff line number Diff line
@@ -391,8 +391,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
@@ -440,8 +439,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,
@@ -524,8 +522,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);
@@ -602,8 +599,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,

dsp/q6adm.c

+1 −2
Original line number Diff line number Diff line
@@ -3069,8 +3069,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));

include/dsp/q6core.h

+1 −13
Original line number Diff line number Diff line 
/* 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__
@@ -307,16 +307,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__ */