Commit 8cdaad96 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "This is a pretty boring pull request, containing a few HD-audio quirks
  and ID updates as usual suspects, as well as a fix for a regression of
  FM801 chip on ia64 (what a legacy combination!)"

* tag 'sound-4.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Add mute led support for HP ProBook 440 G4
  ALSA: hda/realtek - No loopback on ALC225/ALC295 codec
  ALSA: hda/realtek - Update headset mode for ALC225
  ALSA: fm801: Initialize chip after IRQ handler is registered
  ALSA: hda/realtek - Update headset mode for ALC298
  ALSA: hda - Add missing NVIDIA GPU codec IDs to patch table
parents 60187bd4 ba92b114

sound/pci/fm801.c

+2 −2
Original line number Diff line number Diff line
@@ -1235,8 +1235,6 @@ static int snd_fm801_create(struct snd_card *card, 
		}

	}



	snd_fm801_chip_init(chip);



	if ((chip->tea575x_tuner & TUNER_ONLY) == 0) {

		if (devm_request_irq(&pci->dev, pci->irq, snd_fm801_interrupt,

				IRQF_SHARED, KBUILD_MODNAME, chip)) {
@@ -1248,6 +1246,8 @@ static int snd_fm801_create(struct snd_card *card, 
		pci_set_master(pci);

	}



	snd_fm801_chip_init(chip);



	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {

		snd_fm801_free(chip);

		return err;

sound/pci/hda/patch_conexant.c

+1 −0
Original line number Diff line number Diff line
@@ -933,6 +933,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { 
	SND_PCI_QUIRK(0x103c, 0x8174, "HP Spectre x360", CXT_FIXUP_HP_SPECTRE),

	SND_PCI_QUIRK(0x103c, 0x8115, "HP Z1 Gen3", CXT_FIXUP_HP_GATE_MIC),

	SND_PCI_QUIRK(0x103c, 0x814f, "HP ZBook 15u G3", CXT_FIXUP_MUTE_LED_GPIO),

	SND_PCI_QUIRK(0x103c, 0x822e, "HP ProBook 440 G4", CXT_FIXUP_MUTE_LED_GPIO),

	SND_PCI_QUIRK(0x1043, 0x138d, "Asus", CXT_FIXUP_HEADPHONE_MIC_PIN),

	SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT_FIXUP_OLPC_XO),

	SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400", CXT_PINCFG_LENOVO_TP410),

sound/pci/hda/patch_hdmi.c

+27 −0
Original line number Diff line number Diff line
@@ -3733,11 +3733,15 @@ HDA_CODEC_ENTRY(0x1002aa01, "R6xx HDMI", patch_atihdmi), 
HDA_CODEC_ENTRY(0x10951390, "SiI1390 HDMI",	patch_generic_hdmi),

HDA_CODEC_ENTRY(0x10951392, "SiI1392 HDMI",	patch_generic_hdmi),

HDA_CODEC_ENTRY(0x17e80047, "Chrontel HDMI",	patch_generic_hdmi),

HDA_CODEC_ENTRY(0x10de0001, "MCP73 HDMI",	patch_nvhdmi_2ch),

HDA_CODEC_ENTRY(0x10de0002, "MCP77/78 HDMI",	patch_nvhdmi_8ch_7x),

HDA_CODEC_ENTRY(0x10de0003, "MCP77/78 HDMI",	patch_nvhdmi_8ch_7x),

HDA_CODEC_ENTRY(0x10de0004, "GPU 04 HDMI",	patch_nvhdmi_8ch_7x),

HDA_CODEC_ENTRY(0x10de0005, "MCP77/78 HDMI",	patch_nvhdmi_8ch_7x),

HDA_CODEC_ENTRY(0x10de0006, "MCP77/78 HDMI",	patch_nvhdmi_8ch_7x),

HDA_CODEC_ENTRY(0x10de0007, "MCP79/7A HDMI",	patch_nvhdmi_8ch_7x),

HDA_CODEC_ENTRY(0x10de0008, "GPU 08 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0009, "GPU 09 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de000a, "GPU 0a HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de000b, "GPU 0b HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de000c, "MCP89 HDMI",	patch_nvhdmi),
@@ -3764,17 +3768,40 @@ HDA_CODEC_ENTRY(0x10de0041, "GPU 41 HDMI/DP", patch_nvhdmi), 
HDA_CODEC_ENTRY(0x10de0042, "GPU 42 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0043, "GPU 43 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0044, "GPU 44 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0045, "GPU 45 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0050, "GPU 50 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0051, "GPU 51 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0052, "GPU 52 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0060, "GPU 60 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0061, "GPU 61 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0062, "GPU 62 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0067, "MCP67 HDMI",	patch_nvhdmi_2ch),

HDA_CODEC_ENTRY(0x10de0070, "GPU 70 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0071, "GPU 71 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0072, "GPU 72 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0073, "GPU 73 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0074, "GPU 74 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0076, "GPU 76 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de007b, "GPU 7b HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de007c, "GPU 7c HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de007d, "GPU 7d HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de007e, "GPU 7e HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0080, "GPU 80 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0081, "GPU 81 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0082, "GPU 82 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0083, "GPU 83 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0084, "GPU 84 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0090, "GPU 90 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0091, "GPU 91 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0092, "GPU 92 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0093, "GPU 93 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0094, "GPU 94 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0095, "GPU 95 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0097, "GPU 97 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0098, "GPU 98 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0099, "GPU 99 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de8001, "MCP73 HDMI",	patch_nvhdmi_2ch),

HDA_CODEC_ENTRY(0x10de8067, "MCP67/68 HDMI",	patch_nvhdmi_2ch),

HDA_CODEC_ENTRY(0x11069f80, "VX900 HDMI/DP",	patch_via_hdmi),

HDA_CODEC_ENTRY(0x11069f81, "VX900 HDMI/DP",	patch_via_hdmi),

HDA_CODEC_ENTRY(0x11069f84, "VX11 HDMI/DP",	patch_generic_hdmi),

sound/pci/hda/patch_realtek.c

+113 −31
Original line number Diff line number Diff line
@@ -3838,6 +3838,17 @@ static void alc269_fixup_hp_line1_mic1_led(struct hda_codec *codec, 
	}

}



static struct coef_fw alc225_pre_hsmode[] = {

	UPDATE_COEF(0x4a, 1<<8, 0),

	UPDATE_COEFEX(0x57, 0x05, 1<<14, 0),

	UPDATE_COEF(0x63, 3<<14, 3<<14),

	UPDATE_COEF(0x4a, 3<<4, 2<<4),

	UPDATE_COEF(0x4a, 3<<10, 3<<10),

	UPDATE_COEF(0x45, 0x3f<<10, 0x34<<10),

	UPDATE_COEF(0x4a, 3<<10, 0),

	{}

};



static void alc_headset_mode_unplugged(struct hda_codec *codec)

{

	static struct coef_fw coef0255[] = {
@@ -3873,6 +3884,10 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) 
		UPDATE_COEF(0x67, 0x2000, 0),

		{}

	};

	static struct coef_fw coef0298[] = {

		UPDATE_COEF(0x19, 0x1300, 0x0300),

		{}

	};

	static struct coef_fw coef0292[] = {

		WRITE_COEF(0x76, 0x000e),

		WRITE_COEF(0x6c, 0x2400),
@@ -3895,13 +3910,7 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) 
		{}

	};

	static struct coef_fw coef0225[] = {

		UPDATE_COEF(0x4a, 1<<8, 0),

		UPDATE_COEFEX(0x57, 0x05, 1<<14, 0),

		UPDATE_COEF(0x63, 3<<14, 3<<14),

		UPDATE_COEF(0x4a, 3<<4, 2<<4),

		UPDATE_COEF(0x4a, 3<<10, 3<<10),

		UPDATE_COEF(0x45, 0x3f<<10, 0x34<<10),

		UPDATE_COEF(0x4a, 3<<10, 0),

		UPDATE_COEF(0x63, 3<<14, 0),

		{}

	};

	static struct coef_fw coef0274[] = {
@@ -3935,7 +3944,10 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) 
		break;

	case 0x10ec0286:

	case 0x10ec0288:

		alc_process_coef_fw(codec, coef0288);

		break;

	case 0x10ec0298:

		alc_process_coef_fw(codec, coef0298);

		alc_process_coef_fw(codec, coef0288);

		break;

	case 0x10ec0292:
@@ -3976,6 +3988,7 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin, 
		{}

	};

	static struct coef_fw coef0288[] = {

		UPDATE_COEF(0x4f, 0x00c0, 0),

		UPDATE_COEF(0x50, 0x2000, 0),

		UPDATE_COEF(0x56, 0x0006, 0),

		UPDATE_COEF(0x4f, 0xfcc0, 0xc400),
@@ -4039,7 +4052,6 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin, 
	case 0x10ec0286:

	case 0x10ec0288:

	case 0x10ec0298:

		alc_update_coef_idx(codec, 0x4f, 0x000c, 0);

		snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);

		alc_process_coef_fw(codec, coef0288);

		snd_hda_set_pin_ctl_cache(codec, mic_pin, PIN_VREF50);
@@ -4072,6 +4084,7 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin, 
	case 0x10ec0225:

	case 0x10ec0295:

	case 0x10ec0299:

		alc_process_coef_fw(codec, alc225_pre_hsmode);

		alc_update_coef_idx(codec, 0x45, 0x3f<<10, 0x31<<10);

		snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);

		alc_process_coef_fw(codec, coef0225);
@@ -4084,7 +4097,12 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin, 
static void alc_headset_mode_default(struct hda_codec *codec)

{

	static struct coef_fw coef0225[] = {

		UPDATE_COEF(0x45, 0x3f<<10, 0x34<<10),

		UPDATE_COEF(0x45, 0x3f<<10, 0x30<<10),

		UPDATE_COEF(0x45, 0x3f<<10, 0x31<<10),

		UPDATE_COEF(0x49, 3<<8, 0<<8),

		UPDATE_COEF(0x4a, 3<<4, 3<<4),

		UPDATE_COEF(0x63, 3<<14, 0),

		UPDATE_COEF(0x67, 0xf000, 0x3000),

		{}

	};

	static struct coef_fw coef0255[] = {
@@ -4138,6 +4156,7 @@ static void alc_headset_mode_default(struct hda_codec *codec) 
	case 0x10ec0225:

	case 0x10ec0295:

	case 0x10ec0299:

		alc_process_coef_fw(codec, alc225_pre_hsmode);

		alc_process_coef_fw(codec, coef0225);

		break;

	case 0x10ec0255:
@@ -4177,6 +4196,8 @@ static void alc_headset_mode_default(struct hda_codec *codec) 
/* Iphone type */

static void alc_headset_mode_ctia(struct hda_codec *codec)

{

	int val;



	static struct coef_fw coef0255[] = {

		WRITE_COEF(0x45, 0xd489), /* Set to CTIA type */

		WRITE_COEF(0x1b, 0x0c2b),
@@ -4219,11 +4240,14 @@ static void alc_headset_mode_ctia(struct hda_codec *codec) 
		WRITE_COEF(0xc3, 0x0000),

		{}

	};

	static struct coef_fw coef0225[] = {

	static struct coef_fw coef0225_1[] = {

		UPDATE_COEF(0x45, 0x3f<<10, 0x35<<10),

		UPDATE_COEF(0x49, 1<<8, 1<<8),

		UPDATE_COEF(0x4a, 7<<6, 7<<6),

		UPDATE_COEF(0x4a, 3<<4, 3<<4),

		UPDATE_COEF(0x63, 3<<14, 2<<14),

		{}

	};

	static struct coef_fw coef0225_2[] = {

		UPDATE_COEF(0x45, 0x3f<<10, 0x35<<10),

		UPDATE_COEF(0x63, 3<<14, 1<<14),

		{}

	};
@@ -4244,8 +4268,17 @@ static void alc_headset_mode_ctia(struct hda_codec *codec) 
		alc_process_coef_fw(codec, coef0233);

		break;

	case 0x10ec0298:

		alc_update_coef_idx(codec, 0x8e, 0x0070, 0x0020);/* Headset output enable */

		/* ALC298 jack type setting is the same with ALC286/ALC288 */

		val = alc_read_coef_idx(codec, 0x50);

		if (val & (1 << 12)) {

			alc_update_coef_idx(codec, 0x8e, 0x0070, 0x0020);

			alc_update_coef_idx(codec, 0x4f, 0xfcc0, 0xd400);

			msleep(300);

		} else {

			alc_update_coef_idx(codec, 0x8e, 0x0070, 0x0010);

			alc_update_coef_idx(codec, 0x4f, 0xfcc0, 0xd400);

			msleep(300);

		}

		break;

	case 0x10ec0286:

	case 0x10ec0288:

		alc_update_coef_idx(codec, 0x4f, 0xfcc0, 0xd400);
@@ -4264,7 +4297,11 @@ static void alc_headset_mode_ctia(struct hda_codec *codec) 
	case 0x10ec0225:

	case 0x10ec0295:

	case 0x10ec0299:

		alc_process_coef_fw(codec, coef0225);

		val = alc_read_coef_idx(codec, 0x45);

		if (val & (1 << 9))

			alc_process_coef_fw(codec, coef0225_2);

		else

			alc_process_coef_fw(codec, coef0225_1);

		break;

	case 0x10ec0867:

		alc_update_coefex_idx(codec, 0x57, 0x5, 1<<14, 0);
@@ -4320,9 +4357,7 @@ static void alc_headset_mode_omtp(struct hda_codec *codec) 
	};

	static struct coef_fw coef0225[] = {

		UPDATE_COEF(0x45, 0x3f<<10, 0x39<<10),

		UPDATE_COEF(0x49, 1<<8, 1<<8),

		UPDATE_COEF(0x4a, 7<<6, 7<<6),

		UPDATE_COEF(0x4a, 3<<4, 3<<4),

		UPDATE_COEF(0x63, 3<<14, 2<<14),

		{}

	};
@@ -4344,7 +4379,9 @@ static void alc_headset_mode_omtp(struct hda_codec *codec) 
		break;

	case 0x10ec0298:

		alc_update_coef_idx(codec, 0x8e, 0x0070, 0x0010);/* Headset output enable */

		/* ALC298 jack type setting is the same with ALC286/ALC288 */

		alc_update_coef_idx(codec, 0x4f, 0xfcc0, 0xe400);

		msleep(300);

		break;

	case 0x10ec0286:

	case 0x10ec0288:

		alc_update_coef_idx(codec, 0x4f, 0xfcc0, 0xe400);
@@ -4384,6 +4421,14 @@ static void alc_determine_headset_type(struct hda_codec *codec) 
		UPDATE_COEF(0x4f, 0xfcc0, 0xd400), /* Check Type */

		{}

	};

	static struct coef_fw coef0298[] = {

		UPDATE_COEF(0x50, 0x2000, 0x2000),

		UPDATE_COEF(0x56, 0x0006, 0x0006),

		UPDATE_COEF(0x66, 0x0008, 0),

		UPDATE_COEF(0x67, 0x2000, 0),

		UPDATE_COEF(0x19, 0x1300, 0x1300),

		{}

	};

	static struct coef_fw coef0293[] = {

		UPDATE_COEF(0x4a, 0x000f, 0x0008), /* Combo Jack auto detect */

		WRITE_COEF(0x45, 0xD429), /* Set to ctia type */
@@ -4396,11 +4441,6 @@ static void alc_determine_headset_type(struct hda_codec *codec) 
		WRITE_COEF(0xc3, 0x0c00),

		{}

	};

	static struct coef_fw coef0225[] = {

		UPDATE_COEF(0x45, 0x3f<<10, 0x34<<10),

		UPDATE_COEF(0x49, 1<<8, 1<<8),

		{}

	};

	static struct coef_fw coef0274[] = {

		UPDATE_COEF(0x4a, 0x0010, 0),

		UPDATE_COEF(0x4a, 0x8000, 0),
@@ -4433,8 +4473,34 @@ static void alc_determine_headset_type(struct hda_codec *codec) 
		is_ctia = (val & 0x0070) == 0x0070;

		break;

	case 0x10ec0298:

		alc_update_coef_idx(codec, 0x8e, 0x0070, 0x0020); /* Headset output enable */

		/* ALC298 check jack type is the same with ALC286/ALC288 */

		snd_hda_codec_write(codec, 0x21, 0,

			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);

		msleep(100);

		snd_hda_codec_write(codec, 0x21, 0,

			    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);

		msleep(200);



		val = alc_read_coef_idx(codec, 0x50);

		if (val & (1 << 12)) {

			alc_update_coef_idx(codec, 0x8e, 0x0070, 0x0020);

			alc_process_coef_fw(codec, coef0288);

			msleep(350);

			val = alc_read_coef_idx(codec, 0x50);

			is_ctia = (val & 0x0070) == 0x0070;

		} else {

			alc_update_coef_idx(codec, 0x8e, 0x0070, 0x0010);

			alc_process_coef_fw(codec, coef0288);

			msleep(350);

			val = alc_read_coef_idx(codec, 0x50);

			is_ctia = (val & 0x0070) == 0x0070;

		}

		alc_process_coef_fw(codec, coef0298);

		snd_hda_codec_write(codec, 0x21, 0,

			    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP);

		msleep(75);

		snd_hda_codec_write(codec, 0x21, 0,

			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);

		break;

	case 0x10ec0286:

	case 0x10ec0288:

		alc_process_coef_fw(codec, coef0288);
@@ -4463,10 +4529,25 @@ static void alc_determine_headset_type(struct hda_codec *codec) 
	case 0x10ec0225:

	case 0x10ec0295:

	case 0x10ec0299:

		alc_process_coef_fw(codec, coef0225);

		alc_process_coef_fw(codec, alc225_pre_hsmode);

		alc_update_coef_idx(codec, 0x67, 0xf000, 0x1000);

		val = alc_read_coef_idx(codec, 0x45);

		if (val & (1 << 9)) {

			alc_update_coef_idx(codec, 0x45, 0x3f<<10, 0x34<<10);

			alc_update_coef_idx(codec, 0x49, 3<<8, 2<<8);

			msleep(800);

			val = alc_read_coef_idx(codec, 0x46);

			is_ctia = (val & 0x00f0) == 0x00f0;

		} else {

			alc_update_coef_idx(codec, 0x45, 0x3f<<10, 0x34<<10);

			alc_update_coef_idx(codec, 0x49, 3<<8, 1<<8);

			msleep(800);

			val = alc_read_coef_idx(codec, 0x46);

			is_ctia = (val & 0x00f0) == 0x00f0;

		}

		alc_update_coef_idx(codec, 0x4a, 7<<6, 7<<6);

		alc_update_coef_idx(codec, 0x4a, 3<<4, 3<<4);

		alc_update_coef_idx(codec, 0x67, 0xf000, 0x3000);

		break;

	case 0x10ec0867:

		is_ctia = true;
@@ -6724,6 +6805,7 @@ static int patch_alc269(struct hda_codec *codec) 
	case 0x10ec0225:

	case 0x10ec0295:

		spec->codec_variant = ALC269_TYPE_ALC225;

		spec->gen.mixer_nid = 0; /* no loopback on ALC225 ALC295 */

		break;

	case 0x10ec0299:

		spec->codec_variant = ALC269_TYPE_ALC225;

CRA Git | Maintained and supported by SUSTech CRA and CCSE