Merge "ASoC: msm: qdsp6v2: compress passthrough fixes" (3336c326) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c

+21 −10

Original line number	Diff line number	Diff line
		@@ -1488,8 +1488,18 @@ static int msm_compr_trigger(struct snd_compr_stream *cstream, int cmd)
		pr_debug("%s: SNDRV_PCM_TRIGGER_START\n", __func__);
		atomic_set(&prtd->start, 1);

		/*
		* compr_set_volume and compr_init_pp_params
		* are used to configure ASM volume hence not
		* needed for compress passthrough playback.
		*
		* compress passthrough volume is controlled in
		* ADM by adm_send_compressed_device_mute()
		*/
		if (prtd->compr_passthr == LEGACY_PCM) {
		/* set volume for the stream before RUN */
		rc = msm_compr_set_volume(cstream, volume[0], volume[1]);
		rc = msm_compr_set_volume(cstream,
		volume[0], volume[1]);
		if (rc)
		pr_err("%s : Set Volume failed : %d\n",
		__func__, rc);
		@@ -1498,6 +1508,7 @@ static int msm_compr_trigger(struct snd_compr_stream *cstream, int cmd)
		if (rc)
		pr_err("%s : init PP params failed : %d\n",
		__func__, rc);
		}

		/* issue RUN command for the stream */
		q6asm_run_nowait(prtd->audio_client, 0, 0, 0);

+2 −2

Original line number	Diff line number	Diff line
		@@ -9183,7 +9183,7 @@ static int msm_routing_put_device_pp_params_mixer(struct snd_kcontrol *kcontrol,
		(msm_bedais[be_idx].compr_passthr_mode !=
		LEGACY_PCM))
		adm_send_compressed_device_mute(port_id,
		copp, mute);
		idx, mute);
		break;
		case ADM_PP_PARAM_LATENCY_ID:
		pr_debug("%s: ADM_PP_PARAM_LATENCY\n", __func__);
		@@ -9197,7 +9197,7 @@ static int msm_routing_put_device_pp_params_mixer(struct snd_kcontrol *kcontrol,
		(msm_bedais[be_idx].compr_passthr_mode !=
		LEGACY_PCM))
		adm_send_compressed_device_latency(port_id,
		copp, latency);
		idx, latency);
		break;
		default:
		pr_info("%s, device pp param %d not supported\n",