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

Commit 62f3a2f7 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - More strict correction of invalid pinctl bits 



Check more strictly about the validity of pinctl values in
snd_hda_set_pin_ctl() and correct the wrong bits automatically.
Also provide the helper function to correct pinctl bits to codec
drivers.

This automatically fixes the invalid pinctl writes that are found in
a few Realtek fixups for NID 0x0f amp like ASUS A6Rp.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d7fdc00a

sound/pci/hda/hda_codec.c

+52 −14
Original line number Diff line number Diff line
@@ -5275,23 +5275,61 @@ unsigned int snd_hda_get_default_vref(struct hda_codec *codec, hda_nid_t pin) 
}

EXPORT_SYMBOL_HDA(snd_hda_get_default_vref);



int _snd_hda_set_pin_ctl(struct hda_codec *codec, hda_nid_t pin,

			 unsigned int val, bool cached)

{

	if (val) {

		unsigned int cap = snd_hda_query_pin_caps(codec, pin);

		if (cap && (val & AC_PINCTL_OUT_EN)) {

/* correct the pin ctl value for matching with the pin cap */

unsigned int snd_hda_correct_pin_ctl(struct hda_codec *codec,

				     hda_nid_t pin, unsigned int val)

{

	static unsigned int cap_lists[][2] = {

		{ AC_PINCTL_VREF_100, AC_PINCAP_VREF_100 },

		{ AC_PINCTL_VREF_80, AC_PINCAP_VREF_80 },

		{ AC_PINCTL_VREF_50, AC_PINCAP_VREF_50 },

		{ AC_PINCTL_VREF_GRD, AC_PINCAP_VREF_GRD },

	};

	unsigned int cap;



	if (!val)

		return 0;

	cap = snd_hda_query_pin_caps(codec, pin);

	if (!cap)

		return val; /* don't know what to do... */



	if (val & AC_PINCTL_OUT_EN) {

		if (!(cap & AC_PINCAP_OUT))

			val &= ~(AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN);

			else if ((val & AC_PINCTL_HP_EN) &&

				 !(cap & AC_PINCAP_HP_DRV))

		else if ((val & AC_PINCTL_HP_EN) && !(cap & AC_PINCAP_HP_DRV))

			val &= ~AC_PINCTL_HP_EN;

	}

		if (cap && (val & AC_PINCTL_IN_EN)) {



	if (val & AC_PINCTL_IN_EN) {

		if (!(cap & AC_PINCAP_IN))

			val &= ~(AC_PINCTL_IN_EN | AC_PINCTL_VREFEN);

		else {

			unsigned int vcap, vref;

			int i;

			vcap = (cap & AC_PINCAP_VREF) >> AC_PINCAP_VREF_SHIFT;

			vref = val & AC_PINCTL_VREFEN;

			for (i = 0; i < ARRAY_SIZE(cap_lists); i++) {

				if (vref == cap_lists[i][0] &&

				    !(vcap & cap_lists[i][1])) {

					if (i == ARRAY_SIZE(cap_lists) - 1)

						vref = AC_PINCTL_VREF_HIZ;

					else

						vref = cap_lists[i + 1][0];

				}

			}

			val &= ~AC_PINCTL_VREFEN;

			val |= vref;

		}

	}



	return val;

}

EXPORT_SYMBOL_HDA(snd_hda_correct_pin_ctl);



int _snd_hda_set_pin_ctl(struct hda_codec *codec, hda_nid_t pin,

			 unsigned int val, bool cached)

{

	val = snd_hda_correct_pin_ctl(codec, pin, val);

	snd_hda_codec_set_pin_target(codec, pin, val);

	if (cached)

		return snd_hda_codec_update_cache(codec, pin, 0,

sound/pci/hda/hda_local.h

+2 −0
Original line number Diff line number Diff line
@@ -490,6 +490,8 @@ struct hda_bus_unsolicited { 
#define PIN_HP_AMP		(AC_PINCTL_HP_EN)



unsigned int snd_hda_get_default_vref(struct hda_codec *codec, hda_nid_t pin);

unsigned int snd_hda_correct_pin_ctl(struct hda_codec *codec,

				     hda_nid_t pin, unsigned int val);

int _snd_hda_set_pin_ctl(struct hda_codec *codec, hda_nid_t pin,

			 unsigned int val, bool cached);