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

Commit c889a853 authored by Fred Oh's avatar Fred Oh
Browse files

ASoC: msm: qdsp6v2: delay sending asm calibration to before RUN cmd 



Glitch/pop is observed in start of playback or after seek. By sending ASM
calibration, soft volume parameter will be set from audio calibration.
Channel gains for a stream should be set before sending soft volume to
DSP. This will avoid any glitch in audio which might occur because of
rapid change in volume level while setting up the appropriate volume for
the stream. By sending asm calibration before RUN command recommended
sequence can be aligned.

Change-Id: I20a914f6c580271f36f6b531ce48ce4770463889
Signed-off-by: default avatarFred Oh <fred@codeaurora.org>
parent 443cb5e0

sound/soc/msm/qdsp6v2/q6asm.c

+162 −9
Original line number Diff line number Diff line
@@ -89,7 +89,9 @@ static int q6asm_map_channels(u8 *channel_mapping, uint32_t channels, 
void *q6asm_mmap_apr_reg(void);



static int q6asm_is_valid_session(struct apr_client_data *data, void *priv);

static int q6asm_map_asm_cal(struct audio_client *ac);

static int q6asm_send_asm_cal(struct audio_client *ac);

static int q6asm_send_asm_cal_nowait(struct audio_client *ac);

static int q6asm_get_asm_topology_cal(void);

static int q6asm_get_asm_app_type_cal(void);
@@ -1433,6 +1435,7 @@ static int32_t is_no_wait_cmd_rsp(uint32_t opcode, uint32_t *cmd_type) 
			case ASM_DATA_CMD_EOS:

			case ASM_DATA_CMD_REMOVE_INITIAL_SILENCE:

			case ASM_DATA_CMD_REMOVE_TRAILING_SILENCE:

			case ASM_STREAM_CMD_SET_PP_PARAMS_V2:

				return 1;

			default:

				pr_debug("%s: default err 0x%x\n",
@@ -2214,8 +2217,8 @@ static int __q6asm_open_read(struct audio_client *ac, 


	ac->io_mode |= TUN_READ_IO_MODE;



	rc = q6asm_send_asm_cal(ac);

	pr_debug("%s: q6asm_send_asm_cal ret=%d\n", __func__, rc);

	rc = q6asm_map_asm_cal(ac);

	pr_debug("%s: q6asm_map_asm_cal ret=%d\n", __func__, rc);



	return 0;

fail_cmd:
@@ -2309,8 +2312,8 @@ int q6asm_open_write_compressed(struct audio_client *ac, uint32_t format, 
				atomic_read(&ac->cmd_state));

		goto fail_cmd;

	}

	rc = q6asm_send_asm_cal(ac);

	pr_debug("%s: q6asm_send_asm_cal ret=%d\n", __func__, rc);

	rc = q6asm_map_asm_cal(ac);

	pr_debug("%s: q6asm_map_asm_cal ret=%d\n", __func__, rc);



	return 0;
@@ -2459,8 +2462,8 @@ static int __q6asm_open_write(struct audio_client *ac, uint32_t format, 
	}

	ac->io_mode |= TUN_WRITE_IO_MODE;



	rc = q6asm_send_asm_cal(ac);

	pr_debug("%s: q6asm_send_asm_cal ret=%d\n", __func__, rc);

	rc = q6asm_map_asm_cal(ac);

	pr_debug("%s: q6asm_map_asm_cal ret=%d\n", __func__, rc);



	return 0;

fail_cmd:
@@ -2640,8 +2643,8 @@ static int __q6asm_open_read_write(struct audio_client *ac, uint32_t rd_format, 
				atomic_read(&ac->cmd_state));

		goto fail_cmd;

	}

	rc = q6asm_send_asm_cal(ac);

	pr_debug("%s: q6asm_send_asm_cal ret=%d\n", __func__, rc);

	rc = q6asm_map_asm_cal(ac);

	pr_debug("%s: q6asm_map_asm_cal ret=%d\n", __func__, rc);



	return 0;

fail_cmd:
@@ -2742,6 +2745,12 @@ int q6asm_run(struct audio_client *ac, uint32_t flags, 
		return -EINVAL;

	}

	pr_debug("%s: session[%d]\n", __func__, ac->session);

	rc = q6asm_send_asm_cal(ac);

	if (rc < 0) {

		/* This is not fatal error to stop, no return is required */

		pr_info("%s: q6asm_send_asm_cal ret=%d\n", __func__, rc);

	}



	q6asm_add_hdr(ac, &run.hdr, sizeof(run), TRUE);

	atomic_set(&ac->cmd_state, -1);
@@ -2797,6 +2806,12 @@ static int __q6asm_run_nowait(struct audio_client *ac, uint32_t flags, 
		return -EINVAL;

	}

	pr_debug("%s: session[%d]\n", __func__, ac->session);

	rc = q6asm_send_asm_cal_nowait(ac);

	if (rc < 0) {

		/* This is not fatal error to stop, no return is required */

		pr_info("%s: q6asm_send_asm_cal ret=%d\n", __func__, rc);

	}



	q6asm_stream_add_hdr_async(ac, &run.hdr, sizeof(run), TRUE, stream_id);

	atomic_set(&ac->cmd_state, 1);

	run.hdr.opcode = ASM_SESSION_CMD_RUN_V2;
@@ -6577,6 +6592,58 @@ done: 
	return app_type;

}



static int q6asm_map_asm_cal(struct audio_client *ac)

{

	struct cal_block_data *cal_block = NULL;

	int rc = -EINVAL;



	pr_debug("%s:\n", __func__);

	if (!ac) {

		pr_err("%s: APR handle NULL\n", __func__);

		return -EINVAL;

	}

	if (ac->apr == NULL) {

		pr_err("%s: AC APR handle NULL\n", __func__);

		return -EINVAL;

	}



	if (cal_data[ASM_AUDSTRM_CAL] == NULL)

		goto done;



	if (ac->perf_mode == ULTRA_LOW_LATENCY_PCM_MODE) {

		rc = 0; /* no cal is required, not error case */

		goto done;

	}



	mutex_lock(&cal_data[ASM_AUDSTRM_CAL]->lock);

	cal_block = cal_utils_get_only_cal_block(cal_data[ASM_AUDSTRM_CAL]);

	if (cal_block == NULL) {

		pr_err("%s: cal_block is NULL\n",

			__func__);

		goto unlock;

	}



	if (cal_block->cal_data.size == 0) {

		rc = 0; /* not error case */

		pr_debug("%s: cal_data.size is 0, don't send cal data\n",

			__func__);

		goto unlock;

	}



	rc = remap_cal_data(cal_block);

	if (rc) {

		pr_err("%s: Remap_cal_data failed for cal %d!\n",

			__func__, ASM_AUDSTRM_CAL);

		goto unlock;

	}



unlock:

	mutex_unlock(&cal_data[ASM_AUDSTRM_CAL]->lock);



done:

	return rc;

}



static int q6asm_send_asm_cal(struct audio_client *ac)

{

	struct cal_block_data *cal_block = NULL;
@@ -6598,8 +6665,10 @@ static int q6asm_send_asm_cal(struct audio_client *ac) 
	if (cal_data[ASM_AUDSTRM_CAL] == NULL)

		goto done;



	if (ac->perf_mode == ULTRA_LOW_LATENCY_PCM_MODE)

	if (ac->perf_mode == ULTRA_LOW_LATENCY_PCM_MODE) {

		rc = 0; /* no cal is required, not error case */

		goto done;

	}



	sz = sizeof(struct apr_hdr) +

		sizeof(struct asm_stream_cmd_set_pp_params_v2);
@@ -6617,6 +6686,7 @@ static int q6asm_send_asm_cal(struct audio_client *ac) 
	}



	if (cal_block->cal_data.size == 0) {

		rc = 0; /* not error case */

		pr_debug("%s: cal_data.size is 0, don't send cal data\n",

			__func__);

		goto unlock;
@@ -6680,6 +6750,89 @@ done: 
	return rc;

}



static int q6asm_send_asm_cal_nowait(struct audio_client *ac)

{

	struct cal_block_data *cal_block = NULL;

	struct apr_hdr	hdr;

	char asm_params[sizeof(struct apr_hdr) +

		sizeof(struct asm_stream_cmd_set_pp_params_v2)];

	struct asm_stream_cmd_set_pp_params_v2 payload_params;

	int rc = -EINVAL;



	pr_debug("%s:\n", __func__);

	if (!ac) {

		pr_err("%s: APR handle NULL\n", __func__);

		return -EINVAL;

	}

	if (ac->apr == NULL) {

		pr_err("%s: AC APR handle NULL\n", __func__);

		return -EINVAL;

	}



	if (cal_data[ASM_AUDSTRM_CAL] == NULL)

		goto done;



	if (ac->perf_mode == ULTRA_LOW_LATENCY_PCM_MODE) {

		rc = 0; /* no cal is required, not error case */

		goto done;

	}



	cal_block = cal_utils_get_only_cal_block(cal_data[ASM_AUDSTRM_CAL]);

	if (cal_block == NULL) {

		pr_err("%s: cal_block is NULL\n",

			__func__);

		goto done;

	}



	if (cal_block->cal_data.size == 0) {

		rc = 0; /* not error case */

		pr_debug("%s: cal_data.size is 0, don't send cal data\n",

			__func__);

		goto done;

	}



	/* no remap is required as open handle cal map*/

	if ((cal_block->map_data.map_size > 0) &&

		(cal_block->map_data.q6map_handle == 0)) {

		pr_err("%s: memory map handle invalid!\n", __func__);

		goto done;

	}



	/* asm_stream_cmd_set_pp_params_v2 has no APR header in it */

	q6asm_add_hdr_async(ac, &hdr, (sizeof(struct apr_hdr) +

		sizeof(struct asm_stream_cmd_set_pp_params_v2)), TRUE);



	atomic_set(&ac->cmd_state, 1);

	hdr.opcode = ASM_STREAM_CMD_SET_PP_PARAMS_V2;

	payload_params.data_payload_addr_lsw =

			lower_32_bits(cal_block->cal_data.paddr);

	payload_params.data_payload_addr_msw =

			upper_32_bits(cal_block->cal_data.paddr);

	payload_params.mem_map_handle = cal_block->map_data.q6map_handle;

	payload_params.data_payload_size = cal_block->cal_data.size;

	memcpy(((u8 *)asm_params), &hdr, sizeof(struct apr_hdr));

	memcpy(((u8 *)asm_params + sizeof(struct apr_hdr)), &payload_params,

			sizeof(struct asm_stream_cmd_set_pp_params_v2));



	pr_debug("%s: phyaddr lsw = %x msw = %x, maphdl = %x calsize = %d\n",

		__func__, payload_params.data_payload_addr_lsw,

		payload_params.data_payload_addr_msw,

		payload_params.mem_map_handle,

		payload_params.data_payload_size);



	atomic_inc(&ac->nowait_cmd_cnt);

	rc = apr_send_pkt(ac->apr, (uint32_t *) asm_params);

	if (rc < 0) {

		pr_err("%s: audio audstrm cal send failed\n", __func__);

		atomic_dec(&ac->nowait_cmd_cnt);

		rc = -EINVAL;

		goto done;

	}



done:

	return rc;

}



static int get_cal_type_index(int32_t cal_type)

{

	int ret = -EINVAL;