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

Commit 9dd175f7 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/hda' into for-linus 

* topic/hda:
  ALSA: hda - Fix the cmd cache keys for amp verbs
  ALSA: add missing definitions(letters) to HD-Audio.txt
parents f4723b22 fcad94a4

Documentation/sound/alsa/HD-Audio.txt

+2 −2
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ PCI SSID look-up. 
What `model` option values are available depends on the codec chip.

Check your codec chip from the codec proc file (see "Codec Proc-File"

section below).  It will show the vendor/product name of your codec

chip.  Then, see Documentation/sound/alsa/HD-Audio-Modelstxt file,

chip.  Then, see Documentation/sound/alsa/HD-Audio-Models.txt file,

the section of HD-audio driver.  You can find a list of codecs

and `model` options belonging to each codec.  For example, for Realtek

ALC262 codec chip, pass `model=ultra` for devices that are compatible
@@ -177,7 +177,7 @@ with Samsung Q1 Ultra. 


Thus, the first thing you can do for any brand-new, unsupported and

non-working HD-audio hardware is to check HD-audio codec and several

different `model` option values.  If you have a luck, some of them

different `model` option values.  If you have any luck, some of them

might suit with your device well.



Some codecs such as ALC880 have a special model option `model=test`.

sound/pci/hda/hda_codec.c

+5 −1
Original line number Diff line number Diff line
@@ -2250,7 +2250,11 @@ int snd_hda_codec_write_cache(struct hda_codec *codec, hda_nid_t nid, 
	err = bus->ops.command(bus, res);

	if (!err) {

		struct hda_cache_head *c;

		u32 key = build_cmd_cache_key(nid, verb);

		u32 key;

		/* parm may contain the verb stuff for get/set amp */

		verb = verb | (parm >> 8);

		parm &= 0xff;

		key = build_cmd_cache_key(nid, verb);

		c = get_alloc_hash(&codec->cmd_cache, key);

		if (c)

			c->val = parm;