Commit b532ff20 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:

 - Fix a regression of USB-audio PCM assignment since 3.4
 - A few VGA-switcheroo-related fixes for proper HDMI audio enablement
 - Fixed the missing initializations of HD-audio verbs, which may have
   resulted in various breakage
 - Some driver-specific ASoC updates
 - A few fixes for the dynamic PCM code
 - The addition of pinctrl support for the i.MX audmux which didn't make
   it into -rc1 due to cross tree dependency issues
 - A few minor fixes in compress API codes

* tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Don't forget to call init verbs added by fixup list
  ALSA: HDA: Pin fixup for Zotac Z68 motherboard
  ALSA: compress_core: cleanup pointers on stop
  ALSA: compress_core: don't wake up on pause
  ALSA: hda - Fix detection of Creative SoundCore3D controllers
  vga_switcheroo: Enable/disable audio clients at the right time
  ALSA: hda - HDMI Audio init all connectors when VGA-switcheroo is off
  vga_switcheroo: Fix error without CONFIG_VGA_SWITCHEROO
  ALSA: hda - Fix uninitialized HDMI controllers with VGA-switcheroo
  vga_switcheroo: Add a helper function to get the client state
  ALSA: usb-audio: Fix substream assignments
  ASoC: tegra: add MODULE_DEVICE_TABLE to tegra30_ahub
  ASoC: wm2000: Always use a 4s timeout for the firmware
  ASoC: dapm: Fix input list to use source widgets
  ASoC: dpcm: Fix dpcm_get_be() to check that DAI is BE
  ASoC: wm8994: Apply volume updates with clocks enabled
  ASoC: wm8994: Ensure all AIFnCLK events are run from the _late variants
  ASoC: imx-audmux: add pinctrl support
  ASoC: dapm: Fix connected widget capture path query.
parents fea7c783 2e8b2b29

drivers/gpu/vga/vga_switcheroo.c

+21 −6
Original line number Diff line number Diff line
@@ -190,6 +190,19 @@ find_active_client(struct list_head *head) 
	return NULL;

}



int vga_switcheroo_get_client_state(struct pci_dev *pdev)

{

	struct vga_switcheroo_client *client;



	client = find_client_from_pci(&vgasr_priv.clients, pdev);

	if (!client)

		return VGA_SWITCHEROO_NOT_FOUND;

	if (!vgasr_priv.active)

		return VGA_SWITCHEROO_INIT;

	return client->pwr_state;

}

EXPORT_SYMBOL(vga_switcheroo_get_client_state);



void vga_switcheroo_unregister_client(struct pci_dev *pdev)

{

	struct vga_switcheroo_client *client;
@@ -291,8 +304,6 @@ static int vga_switchto_stage1(struct vga_switcheroo_client *new_client) 
		vga_switchon(new_client);



	vga_set_default_device(new_client->pdev);

	set_audio_state(new_client->id, VGA_SWITCHEROO_ON);



	return 0;

}
@@ -308,6 +319,8 @@ static int vga_switchto_stage2(struct vga_switcheroo_client *new_client) 


	active->active = false;



	set_audio_state(active->id, VGA_SWITCHEROO_OFF);



	if (new_client->fb_info) {

		struct fb_event event;

		event.info = new_client->fb_info;
@@ -321,11 +334,11 @@ static int vga_switchto_stage2(struct vga_switcheroo_client *new_client) 
	if (new_client->ops->reprobe)

		new_client->ops->reprobe(new_client->pdev);



	set_audio_state(active->id, VGA_SWITCHEROO_OFF);



	if (active->pwr_state == VGA_SWITCHEROO_ON)

		vga_switchoff(active);



	set_audio_state(new_client->id, VGA_SWITCHEROO_ON);



	new_client->active = true;

	return 0;

}
@@ -371,8 +384,9 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf, 
	/* pwr off the device not in use */

	if (strncmp(usercmd, "OFF", 3) == 0) {

		list_for_each_entry(client, &vgasr_priv.clients, list) {

			if (client->active)

			if (client->active || client_is_audio(client))

				continue;

			set_audio_state(client->id, VGA_SWITCHEROO_OFF);

			if (client->pwr_state == VGA_SWITCHEROO_ON)

				vga_switchoff(client);

		}
@@ -381,10 +395,11 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf, 
	/* pwr on the device not in use */

	if (strncmp(usercmd, "ON", 2) == 0) {

		list_for_each_entry(client, &vgasr_priv.clients, list) {

			if (client->active)

			if (client->active || client_is_audio(client))

				continue;

			if (client->pwr_state == VGA_SWITCHEROO_OFF)

				vga_switchon(client);

			set_audio_state(client->id, VGA_SWITCHEROO_ON);

		}

		goto out;

	}

include/linux/vga_switcheroo.h

+7 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ 
enum vga_switcheroo_state {

	VGA_SWITCHEROO_OFF,

	VGA_SWITCHEROO_ON,

	/* below are referred only from vga_switcheroo_get_client_state() */

	VGA_SWITCHEROO_INIT,

	VGA_SWITCHEROO_NOT_FOUND,

};



enum vga_switcheroo_client_id {
@@ -50,6 +53,8 @@ void vga_switcheroo_unregister_handler(void); 


int vga_switcheroo_process_delayed_switch(void);



int vga_switcheroo_get_client_state(struct pci_dev *dev);



#else



static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
@@ -62,5 +67,7 @@ static inline int vga_switcheroo_register_audio_client(struct pci_dev *pdev, 
	int id, bool active) { return 0; }

static inline void vga_switcheroo_unregister_handler(void) {}

static inline int vga_switcheroo_process_delayed_switch(void) { return 0; }

static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return VGA_SWITCHEROO_ON; }





#endif

sound/core/compress_offload.c

+5 −3
Original line number Diff line number Diff line
@@ -502,10 +502,8 @@ static int snd_compr_pause(struct snd_compr_stream *stream) 
	if (stream->runtime->state != SNDRV_PCM_STATE_RUNNING)

		return -EPERM;

	retval = stream->ops->trigger(stream, SNDRV_PCM_TRIGGER_PAUSE_PUSH);

	if (!retval) {

	if (!retval)

		stream->runtime->state = SNDRV_PCM_STATE_PAUSED;

		wake_up(&stream->runtime->sleep);

	}

	return retval;

}
@@ -544,6 +542,10 @@ static int snd_compr_stop(struct snd_compr_stream *stream) 
	if (!retval) {

		stream->runtime->state = SNDRV_PCM_STATE_SETUP;

		wake_up(&stream->runtime->sleep);

		stream->runtime->hw_pointer = 0;

		stream->runtime->app_pointer = 0;

		stream->runtime->total_bytes_available = 0;

		stream->runtime->total_bytes_transferred = 0;

	}

	return retval;

}

sound/pci/hda/hda_intel.c

+10 −7
Original line number Diff line number Diff line
@@ -2484,9 +2484,9 @@ static void azx_notifier_unregister(struct azx *chip) 
static int DELAYED_INIT_MARK azx_first_init(struct azx *chip);

static int DELAYED_INIT_MARK azx_probe_continue(struct azx *chip);



#ifdef SUPPORT_VGA_SWITCHEROO

static struct pci_dev __devinit *get_bound_vga(struct pci_dev *pci);



#ifdef SUPPORT_VGA_SWITCHEROO

static void azx_vs_set_state(struct pci_dev *pci,

			     enum vga_switcheroo_state state)

{
@@ -2578,6 +2578,7 @@ static int __devinit register_vga_switcheroo(struct azx *chip) 
#else

#define init_vga_switcheroo(chip)		/* NOP */

#define register_vga_switcheroo(chip)		0

#define check_hdmi_disabled(pci)	false

#endif /* SUPPORT_VGA_SWITCHER */



/*
@@ -2638,6 +2639,7 @@ static int azx_dev_free(struct snd_device *device) 
	return azx_free(device->device_data);

}



#ifdef SUPPORT_VGA_SWITCHEROO

/*

 * Check of disabled HDMI controller by vga-switcheroo

 */
@@ -2670,12 +2672,13 @@ static bool __devinit check_hdmi_disabled(struct pci_dev *pci) 
	struct pci_dev *p = get_bound_vga(pci);



	if (p) {

		if (vga_default_device() && p != vga_default_device())

		if (vga_switcheroo_get_client_state(p) == VGA_SWITCHEROO_OFF)

			vga_inactive = true;

		pci_dev_put(p);

	}

	return vga_inactive;

}

#endif /* SUPPORT_VGA_SWITCHEROO */



/*

 * white/black-listing for position_fix
@@ -3351,6 +3354,11 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { 
	{ PCI_DEVICE(0x6549, 0x1200),

	  .driver_data = AZX_DRIVER_TERA | AZX_DCAPS_NO_64BIT },

	/* Creative X-Fi (CA0110-IBG) */

	/* CTHDA chips */

	{ PCI_DEVICE(0x1102, 0x0010),

	  .driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA },

	{ PCI_DEVICE(0x1102, 0x0012),

	  .driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA },

#if !defined(CONFIG_SND_CTXFI) && !defined(CONFIG_SND_CTXFI_MODULE)

	/* the following entry conflicts with snd-ctxfi driver,

	 * as ctxfi driver mutates from HD-audio to native mode with
@@ -3367,11 +3375,6 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { 
	  .driver_data = AZX_DRIVER_CTX | AZX_DCAPS_CTX_WORKAROUND |

	  AZX_DCAPS_RIRB_PRE_DELAY | AZX_DCAPS_POSFIX_LPIB },

#endif

	/* CTHDA chips */

	{ PCI_DEVICE(0x1102, 0x0010),

	  .driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA },

	{ PCI_DEVICE(0x1102, 0x0012),

	  .driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA },

	/* Vortex86MX */

	{ PCI_DEVICE(0x17f3, 0x3010), .driver_data = AZX_DRIVER_GENERIC },

	/* VMware HDAudio */

sound/pci/hda/patch_conexant.c

+1 −1
Original line number Diff line number Diff line
@@ -4061,7 +4061,7 @@ static void cx_auto_init_digital(struct hda_codec *codec) 
static int cx_auto_init(struct hda_codec *codec)

{

	struct conexant_spec *spec = codec->spec;

	/*snd_hda_sequence_write(codec, cx_auto_init_verbs);*/

	snd_hda_gen_apply_verbs(codec);

	cx_auto_init_output(codec);

	cx_auto_init_input(codec);

	cx_auto_init_digital(codec);

CRA Git | Maintained and supported by SUSTech CRA and CCSE