Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8292084 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

Takashi writes:
  "sound fixes for 4.19-rc5

   here comes a collection of various fixes, mostly for stable-tree
   or regression fixes.

   Two relatively high LOCs are about the (rather simple) conversion of
   uapi integer types in topology API, and a regression fix about HDMI
   hotplug notification on AMD HD-audio.  The rest are all small
   individual fixes like ASoC Intel Skylake race condition, minor
   uninitialized page leak in emu10k1 ioctl, Firewire audio error paths,
   and so on."

* tag 'sound-4.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (33 commits)
  ALSA: fireworks: fix memory leak of response buffer at error path
  ALSA: oxfw: fix memory leak of discovered stream formats at error path
  ALSA: oxfw: fix memory leak for model-dependent data at error path
  ALSA: bebob: fix memory leak for M-Audio FW1814 and ProjectMix I/O at error path
  ALSA: hda - Enable runtime PM only for discrete GPU
  ALSA: oxfw: fix memory leak of private data
  ALSA: firewire-tascam: fix memory leak of private data
  ALSA: firewire-digi00x: fix memory leak of private data
  sound: don't call skl_init_chip() to reset intel skl soc
  sound: enable interrupt after dma buffer initialization
  Revert "ASoC: Intel: Skylake: Acquire irq after RIRB allocation"
  ALSA: emu10k1: fix possible info leak to userspace on SNDRV_EMU10K1_IOCTL_INFO
  ASoC: cs4265: fix MMTLR Data switch control
  ASoC: AMD: Ensure reset bit is cleared before configuring
  ALSA: fireface: fix memory leak in ff400_switch_fetching_mode()
  ALSA: bebob: use address returned by kmalloc() instead of kernel stack for streaming DMA mapping
  ASoC: rsnd: don't fallback to PIO mode when -EPROBE_DEFER
  ASoC: rsnd: adg: care clock-frequency size
  ASoC: uniphier: change status to orphan
  ASoC: rsnd: fixup not to call clk_get/set under non-atomic
  ...
parents eb9a29f9 196f4eee

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -13449,9 +13449,8 @@ F: drivers/i2c/busses/i2c-synquacer.c 
F:	Documentation/devicetree/bindings/i2c/i2c-synquacer.txt



SOCIONEXT UNIPHIER SOUND DRIVER

M:	Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com>

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

S:	Maintained

S:	Orphan

F:	sound/soc/uniphier/



SOEKRIS NET48XX LED SUPPORT

drivers/gpu/vga/vga_switcheroo.c

+2 −0
Original line number Diff line number Diff line
@@ -215,6 +215,8 @@ static void vga_switcheroo_enable(void) 
			return;



		client->id = ret | ID_BIT_AUDIO;

		if (client->ops->gpu_bound)

			client->ops->gpu_bound(client->pdev, ret);

	}



	vga_switcheroo_debugfs_init(&vgasr_priv);

include/linux/vga_switcheroo.h

+3 −0
Original line number Diff line number Diff line
@@ -133,15 +133,18 @@ struct vga_switcheroo_handler { 
 * @can_switch: check if the device is in a position to switch now.

 * 	Mandatory. The client should return false if a user space process

 * 	has one of its device files open

 * @gpu_bound: notify the client id to audio client when the GPU is bound.

 *

 * Client callbacks. A client can be either a GPU or an audio device on a GPU.

 * The @set_gpu_state and @can_switch methods are mandatory, @reprobe may be

 * set to NULL. For audio clients, the @reprobe member is bogus.

 * OTOH, @gpu_bound is only for audio clients, and not used for GPU clients.

 */

struct vga_switcheroo_client_ops {

	void (*set_gpu_state)(struct pci_dev *dev, enum vga_switcheroo_state);

	void (*reprobe)(struct pci_dev *dev);

	bool (*can_switch)(struct pci_dev *dev);

	void (*gpu_bound)(struct pci_dev *dev, enum vga_switcheroo_client_id);

};



#if defined(CONFIG_VGA_SWITCHEROO)

include/sound/hdaudio.h

+1 −0
Original line number Diff line number Diff line
@@ -412,6 +412,7 @@ void snd_hdac_bus_init_cmd_io(struct hdac_bus *bus); 
void snd_hdac_bus_stop_cmd_io(struct hdac_bus *bus);

void snd_hdac_bus_enter_link_reset(struct hdac_bus *bus);

void snd_hdac_bus_exit_link_reset(struct hdac_bus *bus);

int snd_hdac_bus_reset_link(struct hdac_bus *bus, bool full_reset);



void snd_hdac_bus_update_rirb(struct hdac_bus *bus);

int snd_hdac_bus_handle_stream_irq(struct hdac_bus *bus, unsigned int status,

include/sound/soc-dapm.h

+1 −0
Original line number Diff line number Diff line
@@ -407,6 +407,7 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, 
int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card);

void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card);

int snd_soc_dapm_new_pcm(struct snd_soc_card *card,

			 struct snd_soc_pcm_runtime *rtd,

			 const struct snd_soc_pcm_stream *params,

			 unsigned int num_params,

			 struct snd_soc_dapm_widget *source,