ALSA: hda - Sync node attributes at resume from widget power saving

tiwai · tiwai · commit d545a57c5f84 · 2015-04-04T12:22:52.000+02:00
So far we assumed that the node attributes like amp values remain
during the power state transition of the node itself.  While this is
true for IDT/STAC codecs I've tested, but some other codecs don't seem
behaving in that way.

This patch implements a partial sync mechanism specific to the given
widget node.  Now we've merged the regmap support, and it can be
easily written with regcache_sync_region().

Tested-by: Hui Wang &lt;hui.wang@canonical.com&gt;
Signed-off-by: Takashi Iwai &lt;tiwai@suse.de&gt;
diff --git a/include/sound/hda_regmap.h b/include/sound/hda_regmap.h
@@ -202,4 +202,16 @@ snd_hdac_regmap_update_amp_stereo(struct hdac_device *codec, hda_nid_t nid,
 	return snd_hdac_regmap_update_raw(codec, cmd, mask, val);
 }
 
+/**
+ * snd_hdac_regmap_sync_node - sync the widget node attributes
+ * @codec: HD-audio codec
+ * @nid: NID to sync
+ */
+static inline void
+snd_hdac_regmap_sync_node(struct hdac_device *codec, hda_nid_t nid)
+{
+	regcache_mark_dirty(codec->regmap);
+	regcache_sync_region(codec->regmap, nid << 20, ((nid + 1) << 20) - 1);
+}
+
 #endif /* __SOUND_HDA_REGMAP_H */
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
@@ -842,10 +842,8 @@ static hda_nid_t path_power_update(struct hda_codec *codec,
 			snd_hda_codec_write(codec, nid, 0,
 					    AC_VERB_SET_POWER_STATE, state);
 			changed = nid;
-			/* here we assume that widget attributes (e.g. amp,
-			 * pinctl connection) don't change with local power
-			 * state change.  If not, need to sync the cache.
-			 */
+			if (state == AC_PWRST_D0)
+				snd_hdac_regmap_sync_node(&codec->core, nid);
 		}
 	}
 	return changed;

Original file line number	Diff line number	Diff line change
`@@ -842,10 +842,8 @@ static hda_nid_t path_power_update(struct hda_codec *codec,`
`842`	`842`	`snd_hda_codec_write(codec, nid, 0,`
`843`	`843`	`AC_VERB_SET_POWER_STATE, state);`
`844`	`844`	`changed = nid;`
`845`		`- /* here we assume that widget attributes (e.g. amp,`
`846`		`- * pinctl connection) don't change with local power`
`847`		`- * state change. If not, need to sync the cache.`
`848`		`- */`
	`845`	`+ if (state == AC_PWRST_D0)`
	`846`	`+ snd_hdac_regmap_sync_node(&codec->core, nid);`
`849`	`847`	`}`
`850`	`848`	`}`
`851`	`849`	`return changed;`