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

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

Merge "dsp : Support different mode POPPs connect to same COPP"

parents 8ef75965 549e4bab

dsp/q6adm.c

+2 −4
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ static int adm_get_copp_id(int port_idx, int copp_idx) 
}



static int adm_get_idx_if_single_copp_exists(int port_idx,

			int topology, int mode,

			int topology,

			int rate, int bit_width,

			uint32_t copp_token)

{
@@ -299,8 +299,6 @@ static int adm_get_idx_if_single_copp_exists(int port_idx, 
	for (idx = 0; idx < MAX_COPPS_PER_PORT; idx++)

		if ((topology ==

			atomic_read(&this_adm.copp.topology[port_idx][idx])) &&

			(mode ==

			 atomic_read(&this_adm.copp.mode[port_idx][idx])) &&

			(rate ==

			 atomic_read(&this_adm.copp.rate[port_idx][idx])) &&

			(bit_width ==
@@ -322,7 +320,7 @@ static int adm_get_idx_if_copp_exists(int port_idx, int topology, int mode, 


	if (copp_token)

		return adm_get_idx_if_single_copp_exists(port_idx,

				topology, mode,

				topology,

				rate, bit_width,

				copp_token);

dsp/q6asm.c

100644 → 100755
+1 −1
Original line number Diff line number Diff line
@@ -3747,7 +3747,7 @@ static int __q6asm_open_write(struct audio_client *ac, uint32_t format, 
	rc = q6asm_get_asm_topology_apptype(&cal_info, ac);

	open.postprocopo_id = cal_info.topology_id;



	if (ac->perf_mode != LEGACY_PCM_MODE)

	if ((ac->perf_mode != LEGACY_PCM_MODE) && (ac->perf_mode != LOW_LATENCY_PCM_MODE))

		open.postprocopo_id = ASM_STREAM_POSTPROCOPO_ID_NONE;



	pr_debug("%s: perf_mode %d asm_topology 0x%x bps %d\n", __func__,