Commit 3c1d29e5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-6.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "This became bigger than usual, as it receives a pile of pending ASoC
  fixes. Most of changes are for device-specific issues while there are
  a few core fixes that are all rather trivial:

   - DMA-engine sync fixes

   - Continued MIDI2 conversion fixes

   - Various ASoC Intel SOF fixes

   - A series of ASoC topology fixes for memory handling

   - AMD ACP fix, curing a recent regression, too

   - Platform / codec-specific fixes for mediatek, atmel, realtek, etc"

* tag 'sound-6.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (40 commits)
  ASoC: rt5645: fix issue of random interrupt from push-button
  ALSA: seq: Fix missing MSB in MIDI2 SPP conversion
  ASoC: amd: yc: Fix non-functional mic on ASUS M5602RA
  ALSA: hda/realtek: fix mute/micmute LEDs don't work for EliteBook 645/665 G11.
  ALSA: hda/realtek: Fix conflicting quirk for PCI SSID 17aa:3820
  ALSA: dmaengine_pcm: terminate dmaengine before synchronize
  ALSA: hda/relatek: Enable Mute LED on HP Laptop 15-gw0xxx
  ALSA: PCM: Allow resume only for suspended streams
  ALSA: seq: Fix missing channel at encoding RPN/NRPN MIDI2 messages
  ASoC: mediatek: mt8195: Add platform entry for ETDM1_OUT_BE dai link
  ASoC: fsl-asoc-card: set priv->pdev before using it
  ASoC: amd: acp: move chip->flag variable assignment
  ASoC: amd: acp: remove i2s configuration check in acp_i2s_probe()
  ASoC: amd: acp: add a null check for chip_pdev structure
  ASoC: Intel: soc-acpi: mtl: fix speaker no sound on Dell SKU 0C64
  ASoC: q6apm-lpass-dai: close graph on prepare errors
  ASoC: cs35l56: Disconnect ASP1 TX sources when ASP1 DAI is hooked up
  ASoC: topology: Fix route memory corruption
  ASoC: rt722-sdca-sdw: add debounce time for type detection
  ASoC: SOF: sof-audio: Skip unprepare for in-use widgets on error rollback
  ...
parents afcd4813 4b3e3810

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -18209,6 +18209,7 @@ QCOM AUDIO (ASoC) DRIVERS 
M:	Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

M:	Banajit Goswami <bgoswami@quicinc.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

L:	linux-arm-msm@vger.kernel.org

S:	Supported

F:	Documentation/devicetree/bindings/soc/qcom/qcom,apr*

F:	Documentation/devicetree/bindings/sound/qcom,*

include/sound/dmaengine_pcm.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ snd_pcm_uframes_t snd_dmaengine_pcm_pointer_no_residue(struct snd_pcm_substream 
int snd_dmaengine_pcm_open(struct snd_pcm_substream *substream,

	struct dma_chan *chan);

int snd_dmaengine_pcm_close(struct snd_pcm_substream *substream);

int snd_dmaengine_pcm_sync_stop(struct snd_pcm_substream *substream);



int snd_dmaengine_pcm_open_request_chan(struct snd_pcm_substream *substream,

	dma_filter_fn filter_fn, void *filter_data);

sound/core/pcm_dmaengine.c

+22 −0
Original line number Diff line number Diff line
@@ -349,6 +349,16 @@ int snd_dmaengine_pcm_open_request_chan(struct snd_pcm_substream *substream, 
}

EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_open_request_chan);



int snd_dmaengine_pcm_sync_stop(struct snd_pcm_substream *substream)

{

	struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);



	dmaengine_synchronize(prtd->dma_chan);



	return 0;

}

EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_sync_stop);



/**

 * snd_dmaengine_pcm_close - Close a dmaengine based PCM substream

 * @substream: PCM substream
@@ -358,6 +368,12 @@ EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_open_request_chan); 
int snd_dmaengine_pcm_close(struct snd_pcm_substream *substream)

{

	struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);

	struct dma_tx_state state;

	enum dma_status status;



	status = dmaengine_tx_status(prtd->dma_chan, prtd->cookie, &state);

	if (status == DMA_PAUSED)

		dmaengine_terminate_async(prtd->dma_chan);



	dmaengine_synchronize(prtd->dma_chan);

	kfree(prtd);
@@ -378,6 +394,12 @@ EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_close); 
int snd_dmaengine_pcm_close_release_chan(struct snd_pcm_substream *substream)

{

	struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);

	struct dma_tx_state state;

	enum dma_status status;



	status = dmaengine_tx_status(prtd->dma_chan, prtd->cookie, &state);

	if (status == DMA_PAUSED)

		dmaengine_terminate_async(prtd->dma_chan);



	dmaengine_synchronize(prtd->dma_chan);

	dma_release_channel(prtd->dma_chan);

sound/core/pcm_native.c

+2 −0
Original line number Diff line number Diff line
@@ -1775,6 +1775,8 @@ static int snd_pcm_pre_resume(struct snd_pcm_substream *substream, 
			      snd_pcm_state_t state)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	if (runtime->state != SNDRV_PCM_STATE_SUSPENDED)

		return -EBADFD;

	if (!(runtime->info & SNDRV_PCM_INFO_RESUME))

		return -ENOSYS;

	runtime->trigger_master = substream;

sound/core/seq/seq_ump_convert.c

+6 −4
Original line number Diff line number Diff line
@@ -791,7 +791,8 @@ static int paf_ev_to_ump_midi2(const struct snd_seq_event *event, 


/* set up the MIDI2 RPN/NRPN packet data from the parsed info */

static void fill_rpn(struct snd_seq_ump_midi2_bank *cc,

		     union snd_ump_midi2_msg *data)

		     union snd_ump_midi2_msg *data,

		     unsigned char channel)

{

	if (cc->rpn_set) {

		data->rpn.status = UMP_MSG_STATUS_RPN;
@@ -808,6 +809,7 @@ static void fill_rpn(struct snd_seq_ump_midi2_bank *cc, 
	}

	data->rpn.data = upscale_14_to_32bit((cc->cc_data_msb << 7) |

					     cc->cc_data_lsb);

	data->rpn.channel = channel;

	cc->cc_data_msb = cc->cc_data_lsb = 0;

}
@@ -855,7 +857,7 @@ static int cc_ev_to_ump_midi2(const struct snd_seq_event *event, 
		cc->cc_data_lsb = val;

		if (!(cc->rpn_set || cc->nrpn_set))

			return 0; // skip

		fill_rpn(cc, data);

		fill_rpn(cc, data, channel);

		return 1;

	}
@@ -957,7 +959,7 @@ static int ctrl14_ev_to_ump_midi2(const struct snd_seq_event *event, 
		cc->cc_data_lsb = lsb;

		if (!(cc->rpn_set || cc->nrpn_set))

			return 0; // skip

		fill_rpn(cc, data);

		fill_rpn(cc, data, channel);

		return 1;

	}
@@ -1018,7 +1020,7 @@ static int system_2p_ev_to_ump_midi2(const struct snd_seq_event *event, 
				     union snd_ump_midi2_msg *data,

				     unsigned char status)

{

	return system_1p_ev_to_ump_midi1(event, dest_port,

	return system_2p_ev_to_ump_midi1(event, dest_port,

					 (union snd_ump_midi1_msg *)data,

					 status);

}