@@ -398,6 +398,7 @@ struct hda_codec {
/* regmap */
struct regmap *regmap;
+ struct snd_array vendor_verbs;
bool caps_overwriting; /* caps overwrite being in process */
};
@@ -35,10 +35,17 @@ static bool hda_writeable_reg(struct device *dev, unsigned int reg)
{
struct hda_codec *codec = dev_to_hda_codec(dev);
unsigned int verb = get_verb(reg);
+ int i;
if (codec->caps_overwriting)
return true;
+ for (i = 0; i < codec->vendor_verbs.used; i++) {
+ unsigned int *v = snd_array_elem(&codec->vendor_verbs, i);
+ if (verb == *v)
+ return true;
+ }
+
switch (verb & 0xf00) {
case AC_VERB_GET_STREAM_FORMAT:
case AC_VERB_GET_AMP_GAIN_MUTE:
@@ -178,6 +185,7 @@ int snd_hda_regmap_init(struct hda_codec *codec)
if (IS_ERR(regmap))
return PTR_ERR(regmap);
codec->regmap = regmap;
+ snd_array_init(&codec->vendor_verbs, sizeof(unsigned int), 8);
return 0;
}
@@ -187,7 +195,19 @@ void snd_hda_regmap_exit(struct hda_codec *codec)
regmap_exit(codec->regmap);
codec->regmap = NULL;
}
+ snd_array_free(&codec->vendor_verbs);
+}
+
+int snd_hda_regmap_add_vendor_verb(struct hda_codec *codec, unsigned int verb)
+{
+ unsigned int *p = snd_array_new(&codec->vendor_verbs);
+
+ if (!p)
+ return -ENOMEM;
+ *p = verb;
+ return 0;
}
+EXPORT_SYMBOL_GPL(snd_hda_regmap_add_vendor_verb);
/*
* helper functions
@@ -13,6 +13,8 @@
int snd_hda_regmap_init(struct hda_codec *codec);
void snd_hda_regmap_exit(struct hda_codec *codec);
+int snd_hda_regmap_add_vendor_verb(struct hda_codec *codec, unsigned int verb);
+
int snd_hda_regmap_write(struct hda_codec *codec, hda_nid_t nid,
unsigned int verb, unsigned int val);
int snd_hda_regmap_update_bits(struct hda_codec *codec, hda_nid_t nid,
Codecs may have own vendor-specific verbs, and we need to allow each driver to give such verbs for cached accesses. Here a verb can be put into a single array and looked through it at readable and writeable callbacks. Signed-off-by: Takashi Iwai <tiwai@suse.de> --- sound/pci/hda/hda_codec.h | 1 + sound/pci/hda/hda_regmap.c | 20 ++++++++++++++++++++ sound/pci/hda/hda_regmap.h | 2 ++ 3 files changed, 23 insertions(+)