ASoC: SOF: use common code to send PCM_FREE IPC (a49b6871) · Commits · 戴 / test

sound/soc/sof/pcm.c

+25 −25

Original line number	Diff line number	Diff line
		@@ -216,6 +216,27 @@ static int sof_pcm_hw_params(struct snd_pcm_substream *substream,
		return ret;
		}

		static int sof_pcm_dsp_pcm_free(struct snd_pcm_substream *substream,
		struct snd_sof_dev *sdev,
		struct snd_sof_pcm *spcm)
		{
		struct sof_ipc_stream stream;
		struct sof_ipc_reply reply;
		int ret;

		stream.hdr.size = sizeof(stream);
		stream.hdr.cmd = SOF_IPC_GLB_STREAM_MSG \| SOF_IPC_STREAM_PCM_FREE;
		stream.comp_id = spcm->stream[substream->stream].comp_id;

		/* send IPC to the DSP */
		ret = sof_ipc_tx_message(sdev->ipc, stream.hdr.cmd, &stream,
		sizeof(stream), &reply, sizeof(reply));
		if (!ret)
		spcm->prepared[substream->stream] = false;

		return ret;
		}

		static int sof_pcm_hw_free(struct snd_pcm_substream *substream)
		{
		struct snd_soc_pcm_runtime *rtd = substream->private_data;
		@@ -223,8 +244,6 @@ static int sof_pcm_hw_free(struct snd_pcm_substream *substream)
		snd_soc_rtdcom_lookup(rtd, DRV_NAME);
		struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);
		struct snd_sof_pcm *spcm;
		struct sof_ipc_stream stream;
		struct sof_ipc_reply reply;
		int ret;

		/* nothing to do for BE */
		@@ -241,13 +260,7 @@ static int sof_pcm_hw_free(struct snd_pcm_substream *substream)
		dev_dbg(sdev->dev, "pcm: free stream %d dir %d\n", spcm->pcm.pcm_id,
		substream->stream);

		stream.hdr.size = sizeof(stream);
		stream.hdr.cmd = SOF_IPC_GLB_STREAM_MSG \| SOF_IPC_STREAM_PCM_FREE;
		stream.comp_id = spcm->stream[substream->stream].comp_id;

		/* send IPC to the DSP */
		ret = sof_ipc_tx_message(sdev->ipc, stream.hdr.cmd, &stream,
		sizeof(stream), &reply, sizeof(reply));
		ret = sof_pcm_dsp_pcm_free(substream, sdev, spcm);

		snd_pcm_lib_free_pages(substream);

		@@ -260,8 +273,6 @@ static int sof_pcm_hw_free(struct snd_pcm_substream *substream)
		if (ret < 0)
		dev_err(sdev->dev, "error: platform hw free failed\n");

		spcm->prepared[substream->stream] = false;

		return ret;
		}

		@@ -365,21 +376,10 @@ static int sof_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
		ret = sof_ipc_tx_message(sdev->ipc, stream.hdr.cmd, &stream,
		sizeof(stream), &reply, sizeof(reply));

		if (ret < 0 \|\| !reset_hw_params)
		return ret;
		if (!ret && reset_hw_params)
		ret = sof_pcm_dsp_pcm_free(substream, sdev, spcm);

		/*
		* In case of stream is stopped, DSP must be reprogrammed upon
		* restart, so free PCM here.
		*/
		stream.hdr.size = sizeof(stream);
		stream.hdr.cmd = SOF_IPC_GLB_STREAM_MSG \| SOF_IPC_STREAM_PCM_FREE;
		stream.comp_id = spcm->stream[substream->stream].comp_id;
		spcm->prepared[substream->stream] = false;

		/* send IPC to the DSP */
		return sof_ipc_tx_message(sdev->ipc, stream.hdr.cmd, &stream,
		sizeof(stream), &reply, sizeof(reply));
		return ret;
		}

		static snd_pcm_uframes_t sof_pcm_pointer(struct snd_pcm_substream *substream)

Admin message