Skip to contentSkip to conversation

sound updates #2 for 5.5-rc1

GIT PULL Merged Takashi Iwai 2 participants 2 messages Dec 6, 2019 Sound

lore
Share & tools
lore
#0 lore raw

Linus,

please pull sound fixes for v5.5-rc1 from:

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-fix-5.5-rc1

The topmost commit is 4cc8d6505ab82db3357613d36e6c58a297f57f7c

----------------------------------------------------------------

sound updates #2 for 5.5-rc1

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

----------------------------------------------------------------

Alex Deucher (4):
ALSA: hda/hdmi - fix vgaswitcheroo detection for AMD
ALSA: hda/hdmi - Add new pci ids for AMD GPU display audio
ALSA: hda/hdmi - enable runtime pm for newer AMD display audio
ALSA: hda/hdmi - enable automatic runtime pm for AMD HDMI codecs by default

Andrew Gabbasov (1):
ALSA: aloop: Avoid pointer dereference before null-check

Jaroslav Kysela (1):
ALSA: hda - fixup for the bass speaker on Lenovo Carbon X1 7th gen

Kai Vehmanen (3):
ALSA: hda: hdmi - fix regression in connect list handling
ALSA: hda: hdmi - fix kernel oops caused by invalid PCM idx
ALSA: hda: hdmi - preserve non-MST PCM routing for Intel platforms

Kailang Yang (1):
ALSA: hda/realtek - Dell headphone has noise on unmute for ALC236

Takashi Iwai (4):
ALSA: hda/realtek - Fix inverted bass GPIO pin on Acer 8951G
ALSA: hda: Modify stream stripe mask only when needed
ALSA: hda: hdmi - Keep old slot assignment behavior for Intel platforms
ALSA: pcm: oss: Avoid potential buffer overflows

---
 include/sound/hdaudio.h       |  1 +
 sound/core/oss/linear.c       |  2 ++
 sound/core/oss/mulaw.c        |  2 ++
 sound/core/oss/route.c        |  2 ++
 sound/drivers/aloop.c         |  8 ++---
 sound/hda/hdac_stream.c       | 19 ++++++----
 sound/pci/hda/hda_intel.c     | 80 ++++++++++++++++++++++++++++++++++++++++---
 sound/pci/hda/patch_hdmi.c    | 68 +++++++++++++++++-------------------
 sound/pci/hda/patch_realtek.c | 41 +++++++++++++---------
 9 files changed, 154 insertions(+), 69 deletions(-)
include/sound/hdaudio.h +1 -0
index b260c5fd2337..e05b95e83d5a 100644
@@ -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
index 2045697f449d..797d838a2f9e 100644
@@ -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
index 7915564bd394..3788906421a7 100644
@@ -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
index c8171f5783c8..72dea04197ef 100644
@@ -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
index 0ebfbe70db00..6bb46423f5ae 100644
@@ -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;
sound/hda/hdac_stream.c +12 -7
index d8fe7ff0cd58..f9707fb05efe 100644
@@ -96,12 +96,14 @@ void snd_hdac_stream_start(struct hdac_stream *azx_dev, bool fresh_start)
 			      1 << azx_dev->index,
 			      1 << azx_dev->index);
 	/* set stripe control */
-	if (azx_dev->substream)
-		stripe_ctl = snd_hdac_get_stream_stripe_ctl(bus, azx_dev->substream);
-	else
-		stripe_ctl = 0;
-	snd_hdac_stream_updateb(azx_dev, SD_CTL_3B, SD_CTL_STRIPE_MASK,
-				stripe_ctl);
+	if (azx_dev->stripe) {
+		if (azx_dev->substream)
+			stripe_ctl = snd_hdac_get_stream_stripe_ctl(bus, azx_dev->substream);
+		else
+			stripe_ctl = 0;
+		snd_hdac_stream_updateb(azx_dev, SD_CTL_3B, SD_CTL_STRIPE_MASK,
+					stripe_ctl);
+	}
 	/* set DMA start and interrupt mask */
 	snd_hdac_stream_updateb(azx_dev, SD_CTL,
 				0, SD_CTL_DMA_START | SD_INT_MASK);
@@ -118,7 +120,10 @@ void snd_hdac_stream_clear(struct hdac_stream *azx_dev)
 	snd_hdac_stream_updateb(azx_dev, SD_CTL,
 				SD_CTL_DMA_START | SD_INT_MASK, 0);
 	snd_hdac_stream_writeb(azx_dev, SD_STS, SD_INT_MASK); /* to be sure */
-	snd_hdac_stream_updateb(azx_dev, SD_CTL_3B, SD_CTL_STRIPE_MASK, 0);
+	if (azx_dev->stripe) {
+		snd_hdac_stream_updateb(azx_dev, SD_CTL_3B, SD_CTL_STRIPE_MASK, 0);
+		azx_dev->stripe = 0;
+	}
 	azx_dev->running = false;
 }
 EXPORT_SYMBOL_GPL(snd_hdac_stream_clear);
sound/pci/hda/hda_intel.c +75 -5

106 lines not on this page · raw message

sound/pci/hda/patch_hdmi.c +31 -37

130 lines not on this page · raw message

sound/pci/hda/patch_realtek.c +25 -16

108 lines not on this page · raw message

merge bot Merged
#1 lore raw
The pull request you sent on Fri, 06 Dec 2019 14:23:17 +0100:

The pull request you sent on Fri, 06 Dec 2019 14:23:17 +0100:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-fix-5.5-rc1

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/3cf2890f29ab6fe491361761df558ef9191cb468

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker