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

Commit ec704b1b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: qdspv6: Fix wrong smmu sid for ULL playback"

parents b24538da 6e98b315

sound/soc/msm/qdsp6v2/q6asm.c

+7 −4
Original line number Diff line number Diff line
@@ -3390,11 +3390,12 @@ int q6asm_set_shared_circ_buff(struct audio_client *ac, 
	open->shared_circ_buf_start_phy_addr_lsw =

			lower_32_bits(buf_circ->phys);

	open->shared_circ_buf_start_phy_addr_msw =

			upper_32_bits(buf_circ->phys);

			msm_audio_populate_upper_32_bits(buf_circ->phys);

	open->shared_circ_buf_size = bufsz * bufcnt;



	open->map_region_circ_buf.shm_addr_lsw = lower_32_bits(buf_circ->phys);

	open->map_region_circ_buf.shm_addr_msw = upper_32_bits(buf_circ->phys);

	open->map_region_circ_buf.shm_addr_msw =

			msm_audio_populate_upper_32_bits(buf_circ->phys);

	open->map_region_circ_buf.mem_size_bytes = bytes_to_alloc;



	mutex_unlock(&ac->cmd_lock);
@@ -3436,10 +3437,12 @@ int q6asm_set_shared_pos_buff(struct audio_client *ac, 
	open->shared_pos_buf_num_regions = 1;

	open->shared_pos_buf_property_flag = 0x00;

	open->shared_pos_buf_phy_addr_lsw = lower_32_bits(buf_pos->phys);

	open->shared_pos_buf_phy_addr_msw = upper_32_bits(buf_pos->phys);

	open->shared_pos_buf_phy_addr_msw =

			msm_audio_populate_upper_32_bits(buf_pos->phys);



	open->map_region_pos_buf.shm_addr_lsw = lower_32_bits(buf_pos->phys);

	open->map_region_pos_buf.shm_addr_msw = upper_32_bits(buf_pos->phys);

	open->map_region_pos_buf.shm_addr_msw =

			msm_audio_populate_upper_32_bits(buf_pos->phys);

	open->map_region_pos_buf.mem_size_bytes = bytes_to_alloc;



done: