Merge "msm: qdsp6v2: Buffer address for Record and playback is 32-byte aligned." (f870a2eb) · Commits · e / devices / android_kernel_sony_msm8994

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -397,6 +397,18 @@ static int msm_pcm_open(struct snd_pcm_substream *substream)
		ret);
		}
		}
		ret = snd_pcm_hw_constraint_step(runtime, 0,
		SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 32);
		if (ret < 0) {
		pr_err("constraint for period bytes step ret = %d\n",
		ret);
		}
		ret = snd_pcm_hw_constraint_step(runtime, 0,
		SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 32);
		if (ret < 0) {
		pr_err("constraint for buffer bytes step ret = %d\n",
		ret);
		}

		prtd->dsp_cnt = 0;
		prtd->set_channel_map = false;

+2 −2

Original line number	Diff line number	Diff line
		@@ -1221,8 +1221,8 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology,
		open.dev_channel_mapping[1] = PCM_CHANNEL_FR;
		} else if (channel_mode == 3) {
		open.dev_channel_mapping[0] = PCM_CHANNEL_FL;
		open.dev_channel_mapping[0] = PCM_CHANNEL_FR;
		open.dev_channel_mapping[1] = PCM_CHANNEL_FC;
		open.dev_channel_mapping[1] = PCM_CHANNEL_FR;
		open.dev_channel_mapping[2] = PCM_CHANNEL_FC;
		} else if (channel_mode == 4) {
		open.dev_channel_mapping[0] = PCM_CHANNEL_FL;
		open.dev_channel_mapping[1] = PCM_CHANNEL_FR;