Commit 20531415 authored by David Henningsson's avatar David Henningsson Committed by Takashi Iwai
Browse files

ALSA: hda - Add a new quirk match based on default pin configuration 



Normally, we match on pci ssid only. This works but needs new code
for every machine. To catch more machines in the same quirk, let's add
a new type of quirk, where we match on
 1) PCI Subvendor ID (i e, not device, just vendor)
 2) Codec ID
 3) Pin configuration default

If all these three match, we could be reasonably certain that the
quirk should apply to the machine even though it might not be the
exact same device.

Signed-off-by: default avatarDavid Henningsson <david.henningsson@canonical.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c21c8cf7

sound/pci/hda/hda_auto_parser.c

+37 −0
Original line number Diff line number Diff line
@@ -839,6 +839,43 @@ void snd_hda_apply_fixup(struct hda_codec *codec, int action) 
}

EXPORT_SYMBOL_GPL(snd_hda_apply_fixup);



static bool pin_config_match(struct hda_codec *codec,

			     const struct hda_pintbl *pins)

{

	for (; pins->nid; pins++) {

		u32 def_conf = snd_hda_codec_get_pincfg(codec, pins->nid);

		if (pins->val != def_conf)

			return false;

	}

	return true;

}



void snd_hda_pick_pin_fixup(struct hda_codec *codec,

			    const struct snd_hda_pin_quirk *pin_quirk,

			    const struct hda_fixup *fixlist)

{

	const struct snd_hda_pin_quirk *pq;



	if (codec->fixup_forced)

		return;



	for (pq = pin_quirk; pq->subvendor; pq++) {

		if (codec->bus->pci->subsystem_vendor != pq->subvendor)

			continue;

		if (codec->vendor_id != pq->codec)

			continue;

		if (pin_config_match(codec, pq->pins)) {

			codec->fixup_id = pq->value;

#ifdef CONFIG_SND_DEBUG_VERBOSE

			codec->fixup_name = pq->name;

#endif

			codec->fixup_list = fixlist;

			return;

		}

	}

}

EXPORT_SYMBOL_GPL(snd_hda_pick_pin_fixup);



void snd_hda_pick_fixup(struct hda_codec *codec,

			const struct hda_model_fixup *models,

			const struct snd_pci_quirk *quirk,

sound/pci/hda/hda_local.h

+14 −0
Original line number Diff line number Diff line
@@ -407,6 +407,16 @@ struct hda_fixup { 
	} v;

};



struct snd_hda_pin_quirk {

	unsigned int codec;             /* Codec vendor/device ID */

	unsigned short subvendor;	/* PCI subvendor ID */

	const struct hda_pintbl *pins;  /* list of matching pins */

#ifdef CONFIG_SND_DEBUG_VERBOSE

	const char *name;

#endif

	int value;			/* quirk value */

};



/* fixup types */

enum {

	HDA_FIXUP_INVALID,
@@ -434,6 +444,10 @@ void snd_hda_pick_fixup(struct hda_codec *codec, 
			const struct hda_model_fixup *models,

			const struct snd_pci_quirk *quirk,

			const struct hda_fixup *fixlist);

void snd_hda_pick_pin_fixup(struct hda_codec *codec,

			    const struct snd_hda_pin_quirk *pin_quirk,

			    const struct hda_fixup *fixlist);





/*

 * unsolicited event handler

CRA Git | Maintained and supported by SUSTech CRA and CCSE