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

Merge tag 'sound-fix-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull more sound updates from Takashi Iwai:
 "A few last-minute updates, most of them are the regression fixes:

   - AMD HD-audio HDMI runtime PM improvements

   - Fixes for HD-audio HDMI regressions wrt DP-MST

   - A regression fix for the previous aloop enhancement

   - A fix for a long-time problem in PCM OSS layer that was spotted by
     fuzzer now

   - A few HD-audio quirks"

* tag 'sound-fix-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: pcm: oss: Avoid potential buffer overflows
  ALSA: hda: hdmi - Keep old slot assignment behavior for Intel platforms
  ALSA: hda: Modify stream stripe mask only when needed
  ALSA: hda - fixup for the bass speaker on Lenovo Carbon X1 7th gen
  ALSA: hda: hdmi - preserve non-MST PCM routing for Intel platforms
  ALSA: hda: hdmi - fix kernel oops caused by invalid PCM idx
  ALSA: hda/realtek - Fix inverted bass GPIO pin on Acer 8951G
  ALSA: hda/realtek - Dell headphone has noise on unmute for ALC236
  ALSA: hda: hdmi - fix regression in connect list handling
  ALSA: aloop: Avoid pointer dereference before null-check
  ALSA: hda/hdmi - enable automatic runtime pm for AMD HDMI codecs by default
  ALSA: hda/hdmi - enable runtime pm for newer AMD display audio
  ALSA: hda/hdmi - Add new pci ids for AMD GPU display audio
  ALSA: hda/hdmi - fix vgaswitcheroo detection for AMD
parents ec057595 4cc8d650

include/sound/hdaudio.h

+1 −0
Original line number Diff line number Diff line
@@ -493,6 +493,7 @@ struct hdac_stream { 
	bool prepared:1;

	bool no_period_wakeup:1;

	bool locked:1;

	bool stripe:1;			/* apply stripe control */



	/* timestamp */

	unsigned long start_wallclk;	/* start + minimum wallclk */

sound/core/oss/linear.c

+2 −0
Original line number Diff line number Diff line
@@ -107,6 +107,8 @@ static snd_pcm_sframes_t linear_transfer(struct snd_pcm_plugin *plugin, 
		}

	}

#endif

	if (frames > dst_channels[0].frames)

		frames = dst_channels[0].frames;

	convert(plugin, src_channels, dst_channels, frames);

	return frames;

}

sound/core/oss/mulaw.c

+2 −0
Original line number Diff line number Diff line
@@ -269,6 +269,8 @@ static snd_pcm_sframes_t mulaw_transfer(struct snd_pcm_plugin *plugin, 
		}

	}

#endif

	if (frames > dst_channels[0].frames)

		frames = dst_channels[0].frames;

	data = (struct mulaw_priv *)plugin->extra_data;

	data->func(plugin, src_channels, dst_channels, frames);

	return frames;

sound/core/oss/route.c

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ static snd_pcm_sframes_t route_transfer(struct snd_pcm_plugin *plugin, 
		return -ENXIO;

	if (frames == 0)

		return 0;

	if (frames > dst_channels[0].frames)

		frames = dst_channels[0].frames;



	nsrcs = plugin->src_format.channels;

	ndsts = plugin->dst_format.channels;

sound/drivers/aloop.c

+4 −4
Original line number Diff line number Diff line
@@ -727,10 +727,6 @@ static void loopback_snd_timer_period_elapsed(struct loopback_cable *cable, 


	dpcm_play = cable->streams[SNDRV_PCM_STREAM_PLAYBACK];

	dpcm_capt = cable->streams[SNDRV_PCM_STREAM_CAPTURE];

	substream_play = (running & (1 << SNDRV_PCM_STREAM_PLAYBACK)) ?

			dpcm_play->substream : NULL;

	substream_capt = (running & (1 << SNDRV_PCM_STREAM_CAPTURE)) ?

			dpcm_capt->substream : NULL;



	if (event == SNDRV_TIMER_EVENT_MSTOP) {

		if (!dpcm_play ||
@@ -741,6 +737,10 @@ static void loopback_snd_timer_period_elapsed(struct loopback_cable *cable, 
		}

	}



	substream_play = (running & (1 << SNDRV_PCM_STREAM_PLAYBACK)) ?

			dpcm_play->substream : NULL;

	substream_capt = (running & (1 << SNDRV_PCM_STREAM_CAPTURE)) ?

			dpcm_capt->substream : NULL;

	valid_runtime = (running & (1 << SNDRV_PCM_STREAM_PLAYBACK)) ?

				dpcm_play->substream->runtime :

				dpcm_capt->substream->runtime;

CRA Git | Maintained and supported by SUSTech CRA and CCSE