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

Commit 86fc0488 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A regression fix of HD-audio runtime PM and two USB quirks"

* tag 'sound-4.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Manage power well properly for resume
  ALSA: usb-audio: Add quirk for ELP HD USB Camera
  ALSA: usb-audio: Add a sample rate quirk for Creative Live! Cam Socialize HD (VF0610)
parents 8766dc68 a52ff34e

sound/pci/hda/hda_intel.c

+20 −12
Original line number Diff line number Diff line
@@ -906,20 +906,23 @@ static int azx_resume(struct device *dev) 
	struct snd_card *card = dev_get_drvdata(dev);

	struct azx *chip;

	struct hda_intel *hda;

	struct hdac_bus *bus;



	if (!card)

		return 0;



	chip = card->private_data;

	hda = container_of(chip, struct hda_intel, chip);

	bus = azx_bus(chip);

	if (chip->disabled || hda->init_failed || !chip->running)

		return 0;



	if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL

		&& hda->need_i915_power) {

		snd_hdac_display_power(azx_bus(chip), true);

		snd_hdac_i915_set_bclk(azx_bus(chip));

	if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {

		snd_hdac_display_power(bus, true);

		if (hda->need_i915_power)

			snd_hdac_i915_set_bclk(bus);

	}



	if (chip->msi)

		if (pci_enable_msi(pci) < 0)

			chip->msi = 0;
@@ -929,6 +932,11 @@ static int azx_resume(struct device *dev) 


	hda_intel_init_chip(chip, true);



	/* power down again for link-controlled chips */

	if ((chip->driver_caps & AZX_DCAPS_I915_POWERWELL) &&

	    !hda->need_i915_power)

		snd_hdac_display_power(bus, false);



	snd_power_change_state(card, SNDRV_CTL_POWER_D0);



	trace_azx_resume(chip);
@@ -1008,6 +1016,7 @@ static int azx_runtime_resume(struct device *dev) 


	chip = card->private_data;

	hda = container_of(chip, struct hda_intel, chip);

	bus = azx_bus(chip);

	if (chip->disabled || hda->init_failed)

		return 0;
@@ -1015,15 +1024,9 @@ static int azx_runtime_resume(struct device *dev) 
		return 0;



	if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {

		bus = azx_bus(chip);

		if (hda->need_i915_power) {

		snd_hdac_display_power(bus, true);

		if (hda->need_i915_power)

			snd_hdac_i915_set_bclk(bus);

		} else {

			/* toggle codec wakeup bit for STATESTS read */

			snd_hdac_set_codec_wakeup(bus, true);

			snd_hdac_set_codec_wakeup(bus, false);

		}

	}



	/* Read STATESTS before controller reset */
@@ -1043,6 +1046,11 @@ static int azx_runtime_resume(struct device *dev) 
	azx_writew(chip, WAKEEN, azx_readw(chip, WAKEEN) &

			~STATESTS_INT_MASK);



	/* power down again for link-controlled chips */

	if ((chip->driver_caps & AZX_DCAPS_I915_POWERWELL) &&

	    !hda->need_i915_power)

		snd_hdac_display_power(bus, false);



	trace_azx_runtime_resume(chip);

	return 0;

}

sound/usb/quirks.c

+2 −0
Original line number Diff line number Diff line
@@ -1128,6 +1128,7 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip) 
{

	/* devices which do not support reading the sample rate. */

	switch (chip->usb_id) {

	case USB_ID(0x041E, 0x4080): /* Creative Live Cam VF0610 */

	case USB_ID(0x045E, 0x075D): /* MS Lifecam Cinema  */

	case USB_ID(0x045E, 0x076D): /* MS Lifecam HD-5000 */

	case USB_ID(0x045E, 0x076E): /* MS Lifecam HD-5001 */
@@ -1138,6 +1139,7 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip) 
	case USB_ID(0x047F, 0xAA05): /* Plantronics DA45 */

	case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */

	case USB_ID(0x0556, 0x0014): /* Phoenix Audio TMX320VC */

	case USB_ID(0x05A3, 0x9420): /* ELP HD USB Camera */

	case USB_ID(0x074D, 0x3553): /* Outlaw RR2150 (Micronas UAC3553B) */

	case USB_ID(0x1de7, 0x0013): /* Phoenix Audio MT202exe */

	case USB_ID(0x1de7, 0x0014): /* Phoenix Audio TMX320 */