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

Commit b4e81876 authored Nov 18, 2009 by Takashi Iwai

ALSA: hda - Fix mute-LED sync on HP laptops with IDT92HD83xxx codecs



The mute-LED isn't synchronized with the actual mute state on some
HP laptops with IDT 92HD83xxx codecs.  A similar hack using
check_power_status callback is added for this codec, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent 8af3aeb4

Documentation/sound/alsa/HD-Audio-Models.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -391,6 +391,7 @@ STAC92HD83*
	ref Reference board		ref Reference board
	mic-ref Reference board with power management for ports		mic-ref Reference board with power management for ports
	dell-s14 Dell laptop		dell-s14 Dell laptop
			hp HP laptops with (inverted) mute-LED
	auto BIOS setup (default)		auto BIOS setup (default)

	STAC9872		STAC9872

sound/pci/hda/patch_sigmatel.c

+37 −2

Original line number	Original line	Diff line number	Diff line
	@@ -93,6 +93,7 @@ enum {
	STAC_92HD83XXX_REF,		STAC_92HD83XXX_REF,
	STAC_92HD83XXX_PWR_REF,		STAC_92HD83XXX_PWR_REF,
	STAC_DELL_S14,		STAC_DELL_S14,
			STAC_92HD83XXX_HP,
	STAC_92HD83XXX_MODELS		STAC_92HD83XXX_MODELS
	};		};

	@@ -1624,6 +1625,7 @@ static const char *stac92hd83xxx_models[STAC_92HD83XXX_MODELS] = {
	[STAC_92HD83XXX_REF] = "ref",		[STAC_92HD83XXX_REF] = "ref",
	[STAC_92HD83XXX_PWR_REF] = "mic-ref",		[STAC_92HD83XXX_PWR_REF] = "mic-ref",
	[STAC_DELL_S14] = "dell-s14",		[STAC_DELL_S14] = "dell-s14",
			[STAC_92HD83XXX_HP] = "hp",
	};		};

	static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {		static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
	@@ -1634,6 +1636,8 @@ static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
	"DFI LanParty", STAC_92HD83XXX_REF),		"DFI LanParty", STAC_92HD83XXX_REF),
	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02ba,		SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02ba,
	"unknown Dell", STAC_DELL_S14),		"unknown Dell", STAC_DELL_S14),
			SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xff00, 0x3600,
			"HP", STAC_92HD83XXX_HP),
	{} /* terminator */		{} /* terminator */
	};		};

	@@ -4834,6 +4838,23 @@ static int stac92xx_hp_check_power_status(struct hda_codec *codec,

	return 0;		return 0;
	}		}

			static int idt92hd83xxx_hp_check_power_status(struct hda_codec *codec,
			hda_nid_t nid)
			{
			struct sigmatel_spec *spec = codec->spec;

			if (nid != 0x13)
			return 0;
			if (snd_hda_codec_amp_read(codec, nid, 0, HDA_OUTPUT, 0) & HDA_AMP_MUTE)
			spec->gpio_data \|= spec->gpio_led; /* mute LED on */
			else
			spec->gpio_data &= ~spec->gpio_led; /* mute LED off */
			stac_gpio_set(codec, spec->gpio_mask, spec->gpio_dir, spec->gpio_data);

			return 0;
			}

	#endif		#endif

	static int stac92xx_suspend(struct hda_codec *codec, pm_message_t state)		static int stac92xx_suspend(struct hda_codec *codec, pm_message_t state)
	@@ -5199,6 +5220,22 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
	break;		break;
	}		}

			codec->patch_ops = stac92xx_patch_ops;

			if (spec->board_config == STAC_92HD83XXX_HP)
			spec->gpio_led = 0x01;

			#ifdef CONFIG_SND_HDA_POWER_SAVE
			if (spec->gpio_led) {
			spec->gpio_mask \|= spec->gpio_led;
			spec->gpio_dir \|= spec->gpio_led;
			spec->gpio_data \|= spec->gpio_led;
			/* register check_power_status callback. */
			codec->patch_ops.check_power_status =
			idt92hd83xxx_hp_check_power_status;
			}
			#endif

	err = stac92xx_parse_auto_config(codec, 0x1d, 0);		err = stac92xx_parse_auto_config(codec, 0x1d, 0);
	if (!err) {		if (!err) {
	if (spec->board_config < 0) {		if (spec->board_config < 0) {
	@@ -5234,8 +5271,6 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
	snd_hda_codec_write_cache(codec, nid, 0,		snd_hda_codec_write_cache(codec, nid, 0,
	AC_VERB_SET_CONNECT_SEL, num_dacs);		AC_VERB_SET_CONNECT_SEL, num_dacs);

	codec->patch_ops = stac92xx_patch_ops;

	codec->proc_widget_hook = stac92hd_proc_hook;		codec->proc_widget_hook = stac92hd_proc_hook;

	return 0;		return 0;