Commit 750ce8cc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A collection of pending small fixes:

  ALSA core:
   - PCM memory leak fix

  ASoC:
   - Lots of SOF and Intel driver fixes
   - Addition of COMMON_CLK for wcd934x
   - Regression fixes for AMD and Tegra platforms

  HD-audio:
   - DP-MST HDMI regression fix, Tegra workarounds, HP quirk fix

  Others:
   - A few fixes relevant with the recent uapi-updates
   - Sparse warnings and endianness fixes"

* tag 'sound-fix-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (35 commits)
  ALSA: hda: Clear RIRB status before reading WP
  ALSA: hda/realtek - Fixed one of HP ALC671 platform Headset Mic supported
  ASoC: wcd934x: Add missing COMMON_CLK dependency to SND_SOC_ALL_CODECS
  ALSA: hda - Fix DP-MST support for NVIDIA codecs
  ASoC: wcd934x: Add missing COMMON_CLK dependency
  MAINTAINERS: Remove the Bard Liao from the MAINTAINERS of Realtek CODECs
  ASoC: tegra: Revert 24 and 32 bit support
  ASoC: SOF: Intel: add PCI ID for JasperLake
  ALSA: hdsp: Make the firmware loading ioctl a bit more readable
  ALSA: emu10k1: Fix annotation and cast for the recent uapi header change
  ALSA: dummy: Fix PCM format loop in proc output
  ALSA: usb-audio: Annotate endianess in Scarlett gen2 quirk
  ALSA: usb-audio: Fix endianess in descriptor validation
  ALSA: hda: Add JasperLake PCI ID and codec vid
  ALSA: pcm: Fix sparse warnings wrt snd_pcm_state_t
  ALSA: pcm: Fix memory leak at closing a stream without hw_free
  ALSA: uapi: Fix sparse warning
  ASoC: rt715: Add __maybe_unused to PM callbacks
  ASoC: rt711: Add __maybe_unused to PM callbacks
  ASoC: rt700: Add __maybe_unused to PM callbacks
  ...
parents 4c46bef2 6954b323

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -14106,7 +14106,6 @@ F: include/linux/platform_data/rtc-* 
F:	tools/testing/selftests/rtc/















REALTEK AUDIO CODECS













M:	Bard Liao <bardliao@realtek.com>















M:	Oder Chiou <oder_chiou@realtek.com>















S:	Maintained















F:	sound/soc/codecs/rt*

































include/sound/pcm.h



+2
−2






























Original line number
Diff line number
Diff line








@@ -1450,7 +1450,7 @@ struct snd_pcm_status64 {













#define SNDRV_PCM_IOCTL_STATUS_EXT64	_IOWR('A', 0x24, struct snd_pcm_status64)































struct snd_pcm_status32 {













	s32 state;		/* stream state */













	snd_pcm_state_t state;		/* stream state */















	s32 trigger_tstamp_sec;	/* time when stream was started/stopped/paused */















	s32 trigger_tstamp_nsec;















	s32 tstamp_sec;		/* reference timestamp */









@@ -1461,7 +1461,7 @@ struct snd_pcm_status32 {













	u32 avail;		/* number of frames available */















	u32 avail_max;		/* max frames available on hw since last status */















	u32 overrange;		/* count of ADC (capture) overrange detections from last status */













	s32 suspended_state;	/* suspended stream state */













	snd_pcm_state_t suspended_state;	/* suspended stream state */















	u32 audio_tstamp_data;	/* needed for 64-bit alignment, used for configs/report to/from userspace */















	s32 audio_tstamp_sec;	/* sample counter, wall clock, PHC or on-demand sync'ed */















	s32 audio_tstamp_nsec;

































include/uapi/sound/asound.h



+2
−2






























Original line number
Diff line number
Diff line








@@ -564,13 +564,13 @@ typedef char __pad_after_uframe[sizeof(__u64) - sizeof(snd_pcm_uframes_t)];













#endif































struct __snd_pcm_mmap_status64 {













	__s32 state;			/* RO: state - SNDRV_PCM_STATE_XXXX */













	snd_pcm_state_t state;		/* RO: state - SNDRV_PCM_STATE_XXXX */















	__u32 pad1;			/* Needed for 64 bit alignment */















	__pad_before_uframe __pad1;















	snd_pcm_uframes_t hw_ptr;	/* RO: hw ptr (0...boundary-1) */















	__pad_after_uframe __pad2;















	struct __snd_timespec64 tstamp;	/* Timestamp */













	__s32 suspended_state;		/* RO: suspended stream state */













	snd_pcm_state_t suspended_state;/* RO: suspended stream state */















	__u32 pad3;			/* Needed for 64 bit alignment */















	struct __snd_timespec64 audio_tstamp; /* sample counter or wall clock */















};

































sound/core/pcm_compat.c



+4
−4






























Original line number
Diff line number
Diff line








@@ -156,7 +156,7 @@ static int snd_pcm_channel_info_user(struct snd_pcm_substream *substream,













#endif /* CONFIG_X86_X32 */































struct compat_snd_pcm_status64 {













	s32 state;













	snd_pcm_state_t state;















	u8 rsvd[4]; /* alignment */















	s64 trigger_tstamp_sec;















	s64 trigger_tstamp_nsec;









@@ -168,7 +168,7 @@ struct compat_snd_pcm_status64 {













	u32 avail;















	u32 avail_max;















	u32 overrange;













	s32 suspended_state;













	snd_pcm_state_t suspended_state;















	u32 audio_tstamp_data;















	s64 audio_tstamp_sec;















	s64 audio_tstamp_nsec;










@@ -376,13 +376,13 @@ static int snd_pcm_ioctl_xfern_compat(struct snd_pcm_substream *substream,













#ifdef CONFIG_X86_X32















/* X32 ABI has 64bit timespec and 64bit alignment */















struct snd_pcm_mmap_status_x32 {













	s32 state;













	snd_pcm_state_t state;















	s32 pad1;















	u32 hw_ptr;















	u32 pad2; /* alignment */















	s64 tstamp_sec;















	s64 tstamp_nsec;













	s32 suspended_state;













	snd_pcm_state_t suspended_state;















	s32 pad3;















	s64 audio_tstamp_sec;















	s64 audio_tstamp_nsec;

































sound/core/pcm_native.c



+136
−75




























File changed.
Preview size limit exceeded, changes collapsed.
































































CRA Git | Maintained and supported by SUSTech CRA and CCSE