[ALSA] hda-codec - optimize resume using caches (82beb8fd) · Commits · 戴 / test

sound/pci/hda/hda_codec.c

+37 −78

Original line number	Diff line number	Diff line
		@@ -836,12 +836,13 @@ int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid, int ch,
		return 0;
		val &= mask;
		val \|= get_vol_mute(codec, info, nid, ch, direction, idx) & ~mask;
		if (info->vol[ch] == val && !codec->in_resume)
		if (info->vol[ch] == val)
		return 0;
		put_vol_mute(codec, info, nid, ch, direction, idx, val);
		return 1;
		}

		#ifdef CONFIG_PM
		/* resume the all amp commands from the cache */
		void snd_hda_codec_resume_amp(struct hda_codec *codec)
		{
		@@ -865,6 +866,7 @@ void snd_hda_codec_resume_amp(struct hda_codec *codec)
		}
		}
		}
		#endif /* CONFIG_PM */

		/*
		* AMP control callbacks
		@@ -1272,10 +1274,12 @@ static int snd_hda_spdif_default_put(struct snd_kcontrol *kcontrol,
		change = codec->spdif_ctls != val;
		codec->spdif_ctls = val;

		if (change \|\| codec->in_resume) {
		snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1,
		if (change) {
		snd_hda_codec_write_cache(codec, nid, 0,
		AC_VERB_SET_DIGI_CONVERT_1,
		val & 0xff);
		snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_2,
		snd_hda_codec_write_cache(codec, nid, 0,
		AC_VERB_SET_DIGI_CONVERT_2,
		val >> 8);
		}

		@@ -1307,17 +1311,19 @@ static int snd_hda_spdif_out_switch_put(struct snd_kcontrol *kcontrol,
		if (ucontrol->value.integer.value[0])
		val \|= AC_DIG1_ENABLE;
		change = codec->spdif_ctls != val;
		if (change \|\| codec->in_resume) {
		if (change) {
		codec->spdif_ctls = val;
		snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1,
		snd_hda_codec_write_cache(codec, nid, 0,
		AC_VERB_SET_DIGI_CONVERT_1,
		val & 0xff);
		/* unmute amp switch (if any) */
		if ((get_wcaps(codec, nid) & AC_WCAP_OUT_AMP) &&
		(val & AC_DIG1_ENABLE))
		snd_hda_codec_write(codec, nid, 0,
		AC_VERB_SET_AMP_GAIN_MUTE,
		AC_AMP_SET_RIGHT \| AC_AMP_SET_LEFT \|
		AC_AMP_SET_OUTPUT);
		(val & AC_DIG1_ENABLE)) {
		snd_hda_codec_amp_update(codec, nid, 0, HDA_OUTPUT, 0,
		0x80, 0x00);
		snd_hda_codec_amp_update(codec, nid, 1, HDA_OUTPUT, 0,
		0x80, 0x00);
		}
		}
		mutex_unlock(&codec->spdif_mutex);
		return change;
		@@ -1409,10 +1415,10 @@ static int snd_hda_spdif_in_switch_put(struct snd_kcontrol *kcontrol,

		mutex_lock(&codec->spdif_mutex);
		change = codec->spdif_in_enable != val;
		if (change \|\| codec->in_resume) {
		if (change) {
		codec->spdif_in_enable = val;
		snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1,
		val);
		snd_hda_codec_write_cache(codec, nid, 0,
		AC_VERB_SET_DIGI_CONVERT_1, val);
		}
		mutex_unlock(&codec->spdif_mutex);
		return change;
		@@ -1482,6 +1488,10 @@ int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid)
		return 0;
		}

		#ifdef CONFIG_PM
		/*
		* command cache
		*/

		/* build a 32bit cache key with the widget id and the command parameter */
		#define build_cmd_cache_key(nid, verb) ((verb << 8) \| nid)
		@@ -1548,6 +1558,7 @@ void snd_hda_sequence_write_cache(struct hda_codec *codec,
		snd_hda_codec_write_cache(codec, seq->nid, 0, seq->verb,
		seq->param);
		}
		#endif /* CONFIG_PM */

		/*
		* set power state of the codec
		@@ -2122,12 +2133,12 @@ int snd_hda_ch_mode_put(struct hda_codec *codec,

		mode = ucontrol->value.enumerated.item[0];
		snd_assert(mode < num_chmodes, return -EINVAL);
		if (*max_channelsp == chmode[mode].channels && !codec->in_resume)
		if (*max_channelsp == chmode[mode].channels)
		return 0;
		/* change the current channel setting */
		*max_channelsp = chmode[mode].channels;
		if (chmode[mode].sequence)
		snd_hda_sequence_write(codec, chmode[mode].sequence);
		snd_hda_sequence_write_cache(codec, chmode[mode].sequence);
		return 1;
		}

		@@ -2160,9 +2171,9 @@ int snd_hda_input_mux_put(struct hda_codec *codec,
		idx = ucontrol->value.enumerated.item[0];
		if (idx >= imux->num_items)
		idx = imux->num_items - 1;
		if (*cur_val == idx && !codec->in_resume)
		if (*cur_val == idx)
		return 0;
		snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL,
		snd_hda_codec_write_cache(codec, nid, 0, AC_VERB_SET_CONNECT_SEL,
		imux->items[idx].index);
		*cur_val = idx;
		return 1;
		@@ -2608,65 +2619,13 @@ int snd_hda_resume(struct hda_bus *bus)
		AC_PWRST_D0);
		if (codec->patch_ops.resume)
		codec->patch_ops.resume(codec);
		}
		return 0;
		}

		/**
		* snd_hda_resume_ctls - resume controls in the new control list
		* @codec: the HDA codec
		* @knew: the array of struct snd_kcontrol_new
		*
		* This function resumes the mixer controls in the struct snd_kcontrol_new array,
		* originally for snd_hda_add_new_ctls().
		* The array must be terminated with an empty entry as terminator.
		*/
		int snd_hda_resume_ctls(struct hda_codec codec, struct snd_kcontrol_new knew)
		{
		struct snd_ctl_elem_value *val;

		val = kmalloc(sizeof(*val), GFP_KERNEL);
		if (!val)
		return -ENOMEM;
		codec->in_resume = 1;
		for (; knew->name; knew++) {
		int i, count;
		count = knew->count ? knew->count : 1;
		for (i = 0; i < count; i++) {
		memset(val, 0, sizeof(*val));
		val->id.iface = knew->iface;
		val->id.device = knew->device;
		val->id.subdevice = knew->subdevice;
		strcpy(val->id.name, knew->name);
		val->id.index = knew->index ? knew->index : i;
		/* Assume that get callback reads only from cache,
		* not accessing to the real hardware
		*/
		if (snd_ctl_elem_read(codec->bus->card, val) < 0)
		continue;
		snd_ctl_elem_write(codec->bus->card, NULL, val);
		else {
		codec->patch_ops.init(codec);
		snd_hda_codec_resume_amp(codec);
		snd_hda_codec_resume_cache(codec);
		}
		}
		codec->in_resume = 0;
		kfree(val);
		return 0;
		}

		/**
		* snd_hda_resume_spdif_out - resume the digital out
		* @codec: the HDA codec
		*/
		int snd_hda_resume_spdif_out(struct hda_codec *codec)
		{
		return snd_hda_resume_ctls(codec, dig_mixes);
		}

		/**
		* snd_hda_resume_spdif_in - resume the digital in
		* @codec: the HDA codec
		*/
		int snd_hda_resume_spdif_in(struct hda_codec *codec)
		{
		return snd_hda_resume_ctls(codec, dig_in_ctls);
		}
		#endif

sound/pci/hda/hda_codec.h

+5 −5

Original line number	Diff line number	Diff line
		@@ -552,11 +552,6 @@ struct hda_codec {
		/* set by patch */
		struct hda_codec_ops patch_ops;

		/* resume phase - all controls should update even if
		* the values are not changed
		*/
		unsigned int in_resume;

		/* PCM to create, set by patch_ops.build_pcms callback */
		unsigned int num_pcms;
		struct hda_pcm *pcm_info;
		@@ -622,11 +617,16 @@ void snd_hda_sequence_write(struct hda_codec *codec,
		int snd_hda_queue_unsol_event(struct hda_bus *bus, u32 res, u32 res_ex);

		/* cached write */
		#ifdef CONFIG_PM
		int snd_hda_codec_write_cache(struct hda_codec *codec, hda_nid_t nid,
		int direct, unsigned int verb, unsigned int parm);
		void snd_hda_sequence_write_cache(struct hda_codec *codec,
		const struct hda_verb *seq);
		void snd_hda_codec_resume_cache(struct hda_codec *codec);
		#else
		#define snd_hda_codec_write_cache snd_hda_codec_write
		#define snd_hda_sequence_write_cache snd_hda_sequence_write
		#endif

		/*
		* Mixer

sound/pci/hda/hda_generic.c

+13 −11

Original line number	Diff line number	Diff line
		@@ -218,9 +218,9 @@ static int unmute_output(struct hda_codec codec, struct hda_gnode node)
		ofs = (node->amp_out_caps & AC_AMPCAP_OFFSET) >> AC_AMPCAP_OFFSET_SHIFT;
		if (val >= ofs)
		val -= ofs;
		val \|= AC_AMP_SET_LEFT \| AC_AMP_SET_RIGHT;
		val \|= AC_AMP_SET_OUTPUT;
		return snd_hda_codec_write(codec, node->nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, val);
		snd_hda_codec_amp_update(codec, node->nid, 0, HDA_OUTPUT, 0, 0xff, val);
		snd_hda_codec_amp_update(codec, node->nid, 0, HDA_OUTPUT, 1, 0xff, val);
		return 0;
		}

		/*
		@@ -234,11 +234,11 @@ static int unmute_input(struct hda_codec codec, struct hda_gnode node, unsigne
		ofs = (node->amp_in_caps & AC_AMPCAP_OFFSET) >> AC_AMPCAP_OFFSET_SHIFT;
		if (val >= ofs)
		val -= ofs;
		val \|= AC_AMP_SET_LEFT \| AC_AMP_SET_RIGHT;
		val \|= AC_AMP_SET_INPUT;
		// awk added - fixed to allow unmuting of indexed amps
		val \|= index << AC_AMP_SET_INDEX_SHIFT;
		return snd_hda_codec_write(codec, node->nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, val);
		snd_hda_codec_amp_update(codec, node->nid, 0, HDA_INPUT, index,
		0xff, val);
		snd_hda_codec_amp_update(codec, node->nid, 1, HDA_INPUT, index,
		0xff, val);
		return 0;
		}

		/*
		@@ -248,7 +248,8 @@ static int select_input_connection(struct hda_codec codec, struct hda_gnode no
		unsigned int index)
		{
		snd_printdd("CONNECT: NID=0x%x IDX=0x%x\n", node->nid, index);
		return snd_hda_codec_write(codec, node->nid, 0, AC_VERB_SET_CONNECT_SEL, index);
		return snd_hda_codec_write_cache(codec, node->nid, 0,
		AC_VERB_SET_CONNECT_SEL, index);
		}

		/*
		@@ -379,7 +380,7 @@ static struct hda_gnode parse_output_jack(struct hda_codec codec,
		/* unmute the PIN output */
		unmute_output(codec, node);
		/* set PIN-Out enable */
		snd_hda_codec_write(codec, node->nid, 0,
		snd_hda_codec_write_cache(codec, node->nid, 0,
		AC_VERB_SET_PIN_WIDGET_CONTROL,
		AC_PINCTL_OUT_EN \|
		((node->pin_caps & AC_PINCAP_HP_DRV) ?
		@@ -570,7 +571,8 @@ static int parse_adc_sub_nodes(struct hda_codec codec, struct hda_gspec spec,
		/* unmute the PIN external input */
		unmute_input(codec, node, 0); /* index = 0? */
		/* set PIN-In enable */
		snd_hda_codec_write(codec, node->nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, pinctl);
		snd_hda_codec_write_cache(codec, node->nid, 0,
		AC_VERB_SET_PIN_WIDGET_CONTROL, pinctl);

		return 1; /* found */
		}

sound/pci/hda/hda_local.h

+2 −9

Original line number	Diff line number	Diff line
		@@ -84,7 +84,9 @@ int snd_hda_codec_amp_read(struct hda_codec *codec, hda_nid_t nid, int ch,
		int direction, int index);
		int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid, int ch,
		int direction, int idx, int mask, int val);
		#ifdef CONFIG_PM
		void snd_hda_codec_resume_amp(struct hda_codec *codec);
		#endif

		/* mono switch binding multiple inputs */
		#define HDA_BIND_MUTE_MONO(xname, nid, channel, indices, direction) \
		@@ -256,15 +258,6 @@ int snd_hda_check_board_config(struct hda_codec *codec, int num_configs,
		int snd_hda_add_new_ctls(struct hda_codec *codec,
		struct snd_kcontrol_new *knew);

		/*
		* power management
		*/
		#ifdef CONFIG_PM
		int snd_hda_resume_ctls(struct hda_codec codec, struct snd_kcontrol_new knew);
		int snd_hda_resume_spdif_out(struct hda_codec *codec);
		int snd_hda_resume_spdif_in(struct hda_codec *codec);
		#endif

		/*
		* unsolicited event handler
		*/

sound/pci/hda/patch_analog.c

+25 −43

Original line number	Diff line number	Diff line
		@@ -318,31 +318,11 @@ static void ad198x_free(struct hda_codec *codec)
		kfree(codec->spec);
		}

		#ifdef CONFIG_PM
		static int ad198x_resume(struct hda_codec *codec)
		{
		struct ad198x_spec *spec = codec->spec;
		int i;

		codec->patch_ops.init(codec);
		for (i = 0; i < spec->num_mixers; i++)
		snd_hda_resume_ctls(codec, spec->mixers[i]);
		if (spec->multiout.dig_out_nid)
		snd_hda_resume_spdif_out(codec);
		if (spec->dig_in_nid)
		snd_hda_resume_spdif_in(codec);
		return 0;
		}
		#endif

		static struct hda_codec_ops ad198x_patch_ops = {
		.build_controls = ad198x_build_controls,
		.build_pcms = ad198x_build_pcms,
		.init = ad198x_init,
		.free = ad198x_free,
		#ifdef CONFIG_PM
		.resume = ad198x_resume,
		#endif
		};


		@@ -376,10 +356,10 @@ static int ad198x_eapd_put(struct snd_kcontrol *kcontrol,
		eapd = ucontrol->value.integer.value[0];
		if (invert)
		eapd = !eapd;
		if (eapd == spec->cur_eapd && ! codec->in_resume)
		if (eapd == spec->cur_eapd)
		return 0;
		spec->cur_eapd = eapd;
		snd_hda_codec_write(codec, nid,
		snd_hda_codec_write_cache(codec, nid,
		0, AC_VERB_SET_EAPD_BTLENABLE,
		eapd ? 0x02 : 0x00);
		return 1;
		@@ -882,8 +862,9 @@ static int ad1983_spdif_route_put(struct snd_kcontrol *kcontrol, struct snd_ctl_

		if (spec->spdif_route != ucontrol->value.enumerated.item[0]) {
		spec->spdif_route = ucontrol->value.enumerated.item[0];
		snd_hda_codec_write(codec, spec->multiout.dig_out_nid, 0,
		AC_VERB_SET_CONNECT_SEL, spec->spdif_route);
		snd_hda_codec_write_cache(codec, spec->multiout.dig_out_nid, 0,
		AC_VERB_SET_CONNECT_SEL,
		spec->spdif_route);
		return 1;
		}
		return 0;
		@@ -1824,11 +1805,11 @@ static int ad1988_spdif_playback_source_put(struct snd_kcontrol *kcontrol,
		AC_VERB_GET_AMP_GAIN_MUTE,
		AC_AMP_GET_INPUT);
		change = sel & 0x80;
		if (change \|\| codec->in_resume) {
		snd_hda_codec_write(codec, 0x1d, 0,
		if (change) {
		snd_hda_codec_write_cache(codec, 0x1d, 0,
		AC_VERB_SET_AMP_GAIN_MUTE,
		AMP_IN_UNMUTE(0));
		snd_hda_codec_write(codec, 0x1d, 0,
		snd_hda_codec_write_cache(codec, 0x1d, 0,
		AC_VERB_SET_AMP_GAIN_MUTE,
		AMP_IN_MUTE(1));
		}
		@@ -1837,20 +1818,21 @@ static int ad1988_spdif_playback_source_put(struct snd_kcontrol *kcontrol,
		AC_VERB_GET_AMP_GAIN_MUTE,
		AC_AMP_GET_INPUT \| 0x01);
		change = sel & 0x80;
		if (change \|\| codec->in_resume) {
		snd_hda_codec_write(codec, 0x1d, 0,
		if (change) {
		snd_hda_codec_write_cache(codec, 0x1d, 0,
		AC_VERB_SET_AMP_GAIN_MUTE,
		AMP_IN_MUTE(0));
		snd_hda_codec_write(codec, 0x1d, 0,
		snd_hda_codec_write_cache(codec, 0x1d, 0,
		AC_VERB_SET_AMP_GAIN_MUTE,
		AMP_IN_UNMUTE(1));
		}
		sel = snd_hda_codec_read(codec, 0x0b, 0,
		AC_VERB_GET_CONNECT_SEL, 0) + 1;
		change \|= sel != val;
		if (change \|\| codec->in_resume)
		snd_hda_codec_write(codec, 0x0b, 0,
		AC_VERB_SET_CONNECT_SEL, val - 1);
		if (change)
		snd_hda_codec_write_cache(codec, 0x0b, 0,
		AC_VERB_SET_CONNECT_SEL,
		val - 1);
		}
		return change;
		}

Admin message