Commit 5f93393a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Just a few small fixes for the usual suspect, HD- and USB-audio:
  enablement of runtime PM for Nvidia due to the recent PCI changes, a
  fix for potential hangs with recent HD-audio platforms, and the rest
  device-specific quirks"

* tag 'sound-5.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Force runtime PM on Nvidia HDMI codecs
  ALSA: hda/realtek - Enable headset mic on Asus MJ401TA
  ALSA: usb-audio: Disable quirks for BOSS Katana amplifiers
  ALSA: hdac: clear link output stream mapping
  ALSA: hda/realtek: Reduce the Headphone static noise on XPS 9350/9360
parents adca4ce3 94989e31

include/sound/hda_register.h

+3 −0
Original line number Diff line number Diff line
@@ -264,6 +264,9 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 }; 
#define AZX_REG_ML_LOUTPAY		0x20

#define AZX_REG_ML_LINPAY		0x30



/* bit0 is reserved, with BIT(1) mapping to stream1 */

#define ML_LOSIDV_STREAM_MASK		0xFFFE



#define ML_LCTL_SCF_MASK			0xF

#define AZX_MLCTL_SPA				(0x1 << 16)

#define AZX_MLCTL_CPA				(0x1 << 23)

sound/hda/ext/hdac_ext_controller.c

+5 −0
Original line number Diff line number Diff line
@@ -270,6 +270,11 @@ int snd_hdac_ext_bus_link_get(struct hdac_bus *bus, 


		ret = snd_hdac_ext_bus_link_power_up(link);



		/*

		 * clear the register to invalidate all the output streams

		 */

		snd_hdac_updatew(link->ml_addr, AZX_REG_ML_LOSIDV,

				 ML_LOSIDV_STREAM_MASK, 0);

		/*

		 *  wait for 521usec for codec to report status

		 *  HDA spec section 4.3 - Codec Discovery

sound/pci/hda/patch_hdmi.c

+2 −0
Original line number Diff line number Diff line
@@ -3474,6 +3474,8 @@ static int patch_nvhdmi(struct hda_codec *codec) 
		nvhdmi_chmap_cea_alloc_validate_get_type;

	spec->chmap.ops.chmap_validate = nvhdmi_chmap_validate;



	codec->link_down_at_suspend = 1;



	generic_acomp_init(codec, &nvhdmi_audio_ops, nvhdmi_port2pin);



	return 0;

sound/pci/hda/patch_realtek.c

+32 −3
Original line number Diff line number Diff line
@@ -5358,6 +5358,17 @@ static void alc271_hp_gate_mic_jack(struct hda_codec *codec, 
	}

}



static void alc256_fixup_dell_xps_13_headphone_noise2(struct hda_codec *codec,

						      const struct hda_fixup *fix,

						      int action)

{

	if (action != HDA_FIXUP_ACT_PRE_PROBE)

		return;



	snd_hda_codec_amp_stereo(codec, 0x1a, HDA_INPUT, 0, HDA_AMP_VOLMASK, 1);

	snd_hda_override_wcaps(codec, 0x1a, get_wcaps(codec, 0x1a) & ~AC_WCAP_IN_AMP);

}



static void alc269_fixup_limit_int_mic_boost(struct hda_codec *codec,

					     const struct hda_fixup *fix,

					     int action)
@@ -5822,6 +5833,7 @@ enum { 
	ALC298_FIXUP_DELL_AIO_MIC_NO_PRESENCE,

	ALC275_FIXUP_DELL_XPS,

	ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE,

	ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE2,

	ALC293_FIXUP_LENOVO_SPK_NOISE,

	ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY,

	ALC255_FIXUP_DELL_SPK_NOISE,
@@ -5869,6 +5881,7 @@ enum { 
	ALC225_FIXUP_WYSE_AUTO_MUTE,

	ALC225_FIXUP_WYSE_DISABLE_MIC_VREF,

	ALC286_FIXUP_ACER_AIO_HEADSET_MIC,

	ALC256_FIXUP_ASUS_HEADSET_MIC,

	ALC256_FIXUP_ASUS_MIC_NO_PRESENCE,

	ALC299_FIXUP_PREDATOR_SPK,

	ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC,
@@ -6558,6 +6571,12 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE

	},

	[ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE2] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc256_fixup_dell_xps_13_headphone_noise2,

		.chained = true,

		.chain_id = ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE

	},

	[ALC293_FIXUP_LENOVO_SPK_NOISE] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc_fixup_disable_aamix,
@@ -6912,6 +6931,15 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE

	},

	[ALC256_FIXUP_ASUS_HEADSET_MIC] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {

			{ 0x19, 0x03a11020 }, /* headset mic with jack detect */

			{ }

		},

		.chained = true,

		.chain_id = ALC256_FIXUP_ASUS_HEADSET_MODE

	},

	[ALC256_FIXUP_ASUS_MIC_NO_PRESENCE] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {
@@ -7001,17 +7029,17 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x06de, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK),

	SND_PCI_QUIRK(0x1028, 0x06df, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK),

	SND_PCI_QUIRK(0x1028, 0x06e0, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK),

	SND_PCI_QUIRK(0x1028, 0x0704, "Dell XPS 13 9350", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE),

	SND_PCI_QUIRK(0x1028, 0x0704, "Dell XPS 13 9350", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE2),

	SND_PCI_QUIRK(0x1028, 0x0706, "Dell Inspiron 7559", ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER),

	SND_PCI_QUIRK(0x1028, 0x0725, "Dell Inspiron 3162", ALC255_FIXUP_DELL_SPK_NOISE),

	SND_PCI_QUIRK(0x1028, 0x0738, "Dell Precision 5820", ALC269_FIXUP_NO_SHUTUP),

	SND_PCI_QUIRK(0x1028, 0x075b, "Dell XPS 13 9360", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE),

	SND_PCI_QUIRK(0x1028, 0x075b, "Dell XPS 13 9360", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE2),

	SND_PCI_QUIRK(0x1028, 0x075c, "Dell XPS 27 7760", ALC298_FIXUP_SPK_VOLUME),

	SND_PCI_QUIRK(0x1028, 0x075d, "Dell AIO", ALC298_FIXUP_SPK_VOLUME),

	SND_PCI_QUIRK(0x1028, 0x07b0, "Dell Precision 7520", ALC295_FIXUP_DISABLE_DAC3),

	SND_PCI_QUIRK(0x1028, 0x0798, "Dell Inspiron 17 7000 Gaming", ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER),

	SND_PCI_QUIRK(0x1028, 0x080c, "Dell WYSE", ALC225_FIXUP_DELL_WYSE_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x082a, "Dell XPS 13 9360", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE),

	SND_PCI_QUIRK(0x1028, 0x082a, "Dell XPS 13 9360", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE2),

	SND_PCI_QUIRK(0x1028, 0x084b, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB),

	SND_PCI_QUIRK(0x1028, 0x084e, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB),

	SND_PCI_QUIRK(0x1028, 0x0871, "Dell Precision 3630", ALC255_FIXUP_DELL_HEADSET_MIC),
@@ -7108,6 +7136,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A),

	SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC),

	SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC),

	SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW),

	SND_PCI_QUIRK(0x1043, 0x1a30, "ASUS X705UD", ALC256_FIXUP_ASUS_MIC),

	SND_PCI_QUIRK(0x1043, 0x1b13, "Asus U41SV", ALC269_FIXUP_INV_DMIC),

sound/usb/pcm.c

+3 −0
Original line number Diff line number Diff line
@@ -348,6 +348,9 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs, 
		ep = 0x84;

		ifnum = 0;

		goto add_sync_ep_from_ifnum;

	case USB_ID(0x0582, 0x01d8): /* BOSS Katana */

		/* BOSS Katana amplifiers do not need quirks */

		return 0;

	}



	if (attr == USB_ENDPOINT_SYNC_ASYNC &&

CRA Git | Maintained and supported by SUSTech CRA and CCSE