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

Commit 6c1f45ea authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Add codec reconfiguration feature 



Added the reconfiguration feature of any individual codec.
Via the reconfiguration, the old resources are released and
the patch is called again to recreate the PCM and mixers in
addition to the re-initialization.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d13bd412

sound/pci/hda/hda_codec.c

+100 −47
Original line number Original line Diff line number Diff line
@@ -344,7 +344,7 @@ static void process_unsol_events(struct work_struct *work) 
/*

/*

 * initialize unsolicited queue

 * initialize unsolicited queue

 */

 */

static int __devinit init_unsol_queue(struct hda_bus *bus)

static int init_unsol_queue(struct hda_bus *bus)

{

{

	struct hda_bus_unsolicited *unsol;

	struct hda_bus_unsolicited *unsol;
@@ -454,7 +454,7 @@ int __devinit snd_hda_bus_new(struct snd_card *card, 
/*

/*

 * find a matching codec preset

 * find a matching codec preset

 */

 */

static const struct hda_codec_preset __devinit *

static const struct hda_codec_preset *

find_codec_preset(struct hda_codec *codec)

find_codec_preset(struct hda_codec *codec)

{

{

	const struct hda_codec_preset **tbl, *preset;

	const struct hda_codec_preset **tbl, *preset;
@@ -624,6 +624,13 @@ int __devinit snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr, 
	init_hda_cache(&codec->amp_cache, sizeof(struct hda_amp_info));

	init_hda_cache(&codec->amp_cache, sizeof(struct hda_amp_info));

	init_hda_cache(&codec->cmd_cache, sizeof(struct hda_cache_head));

	init_hda_cache(&codec->cmd_cache, sizeof(struct hda_cache_head));

	snd_array_init(&codec->mixers, sizeof(struct snd_kcontrol *), 32);

	snd_array_init(&codec->mixers, sizeof(struct snd_kcontrol *), 32);

	if (codec->bus->modelname) {

		codec->modelname = kstrdup(codec->bus->modelname, GFP_KERNEL);

		if (!codec->modelname) {

			snd_hda_codec_free(codec);

			return -ENODEV;

		}

	}





#ifdef CONFIG_SND_HDA_POWER_SAVE

#ifdef CONFIG_SND_HDA_POWER_SAVE

	INIT_DELAYED_WORK(&codec->power_work, hda_power_work);

	INIT_DELAYED_WORK(&codec->power_work, hda_power_work);
@@ -672,6 +679,30 @@ int __devinit snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr, 
	if (bus->modelname)

	if (bus->modelname)

		codec->modelname = kstrdup(bus->modelname, GFP_KERNEL);

		codec->modelname = kstrdup(bus->modelname, GFP_KERNEL);





	err = snd_hda_codec_configure(codec);

	if (err < 0) {

		snd_hda_codec_free(codec);

		return err;

	}

	snd_hda_codec_proc_new(codec);



#ifdef CONFIG_SND_HDA_HWDEP

	snd_hda_create_hwdep(codec);

#endif



	sprintf(component, "HDA:%08x,%08x,%08x", codec->vendor_id,

		codec->subsystem_id, codec->revision_id);

	snd_component_add(codec->bus->card, component);



	if (codecp)

		*codecp = codec;

	return 0;

}



int snd_hda_codec_configure(struct hda_codec *codec)

{

	int err;



	codec->preset = find_codec_preset(codec);

	codec->preset = find_codec_preset(codec);

	if (!codec->name) {

	if (!codec->name) {

		err = get_codec_name(codec);

		err = get_codec_name(codec);
@@ -698,27 +729,11 @@ int __devinit snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr, 
		printk(KERN_ERR "hda-codec: No codec parser is available\n");

		printk(KERN_ERR "hda-codec: No codec parser is available\n");





 patched:

 patched:

	if (err < 0) {

	if (!err && codec->patch_ops.unsol_event)

		snd_hda_codec_free(codec);

		err = init_unsol_queue(codec->bus);

	return err;

	return err;

}

}





	if (codec->patch_ops.unsol_event)

		init_unsol_queue(bus);



	snd_hda_codec_proc_new(codec);

#ifdef CONFIG_SND_HDA_HWDEP

	snd_hda_create_hwdep(codec);

#endif



	sprintf(component, "HDA:%08x,%08x,%08x", codec->vendor_id, codec->subsystem_id, codec->revision_id);

	snd_component_add(codec->bus->card, component);



	if (codecp)

		*codecp = codec;

	return 0;

}



/**

/**

 * snd_hda_codec_setup_stream - set up the codec for streaming

 * snd_hda_codec_setup_stream - set up the codec for streaming

 * @codec: the CODEC to set up

 * @codec: the CODEC to set up
@@ -1118,6 +1133,31 @@ void snd_hda_ctls_clear(struct hda_codec *codec) 
	snd_array_free(&codec->mixers);

	snd_array_free(&codec->mixers);

}

}





void snd_hda_codec_reset(struct hda_codec *codec)

{

	int i;



#ifdef CONFIG_SND_HDA_POWER_SAVE

	cancel_delayed_work(&codec->power_work);

	flush_scheduled_work();

#endif

	snd_hda_ctls_clear(codec);

	/* relase PCMs */

	for (i = 0; i < codec->num_pcms; i++) {

		if (codec->pcm_info[i].pcm)

			snd_device_free(codec->bus->card,

					codec->pcm_info[i].pcm);

	}

	if (codec->patch_ops.free)

		codec->patch_ops.free(codec);

	codec->spec = NULL;

	free_hda_cache(&codec->amp_cache);

	free_hda_cache(&codec->cmd_cache);

	codec->num_pcms = 0;

	codec->pcm_info = NULL;

	codec->preset = NULL;

}



/* create a virtual master control and add slaves */

/* create a virtual master control and add slaves */

int snd_hda_add_vmaster(struct hda_codec *codec, char *name,

int snd_hda_add_vmaster(struct hda_codec *codec, char *name,

			unsigned int *tlv, const char **slaves)

			unsigned int *tlv, const char **slaves)
@@ -1939,6 +1979,15 @@ int __devinit snd_hda_build_controls(struct hda_bus *bus) 
	struct hda_codec *codec;

	struct hda_codec *codec;





	list_for_each_entry(codec, &bus->codec_list, list) {

	list_for_each_entry(codec, &bus->codec_list, list) {

		int err = snd_hda_codec_build_controls(codec);

		if (err < 0)

			return err;

	}

	return 0;

}



int snd_hda_codec_build_controls(struct hda_codec *codec)

{

	int err = 0;

	int err = 0;

	/* fake as if already powered-on */

	/* fake as if already powered-on */

	hda_keep_power_on(codec);

	hda_keep_power_on(codec);
@@ -1954,8 +2003,6 @@ int __devinit snd_hda_build_controls(struct hda_bus *bus) 
	snd_hda_power_down(codec);

	snd_hda_power_down(codec);

	if (err < 0)

	if (err < 0)

		return err;

		return err;

	}



	return 0;

	return 0;

}

}
@@ -2256,7 +2303,7 @@ static int hda_pcm_default_cleanup(struct hda_pcm_stream *hinfo, 
	return 0;

	return 0;

}

}





static int __devinit set_pcm_default_values(struct hda_codec *codec,

static int set_pcm_default_values(struct hda_codec *codec,

				  struct hda_pcm_stream *info)

				  struct hda_pcm_stream *info)

{

{

	/* query support PCM information from the given NID */

	/* query support PCM information from the given NID */
@@ -2331,7 +2378,7 @@ snd_hda_attach_pcm(struct hda_codec *codec, struct hda_pcm *pcm) 
 *

 *

 * This function returns 0 if successfull, or a negative error code.

 * This function returns 0 if successfull, or a negative error code.

 */

 */

int __devinit snd_hda_build_pcms(struct hda_bus *bus)

int snd_hda_build_pcms(struct hda_bus *bus)

{

{

	static const char *dev_name[HDA_PCM_NTYPES] = {

	static const char *dev_name[HDA_PCM_NTYPES] = {

		"Audio", "SPDIF", "HDMI", "Modem"

		"Audio", "SPDIF", "HDMI", "Modem"
@@ -2352,14 +2399,17 @@ int __devinit snd_hda_build_pcms(struct hda_bus *bus) 
	list_for_each_entry(codec, &bus->codec_list, list) {

	list_for_each_entry(codec, &bus->codec_list, list) {

		unsigned int pcm;

		unsigned int pcm;

		int err;

		int err;

		if (!codec->num_pcms) {

			if (!codec->patch_ops.build_pcms)

			if (!codec->patch_ops.build_pcms)

				continue;

				continue;

			err = codec->patch_ops.build_pcms(codec);

			err = codec->patch_ops.build_pcms(codec);

			if (err < 0)

			if (err < 0)

				return err;

				return err;

		}

		for (pcm = 0; pcm < codec->num_pcms; pcm++) {

		for (pcm = 0; pcm < codec->num_pcms; pcm++) {

			struct hda_pcm *cpcm = &codec->pcm_info[pcm];

			struct hda_pcm *cpcm = &codec->pcm_info[pcm];

			int type = cpcm->pcm_type;

			int type = cpcm->pcm_type;

			int dev;

			switch (type) {

			switch (type) {

			case HDA_PCM_TYPE_AUDIO:

			case HDA_PCM_TYPE_AUDIO:

				if (num_devs[type] >= ARRAY_SIZE(audio_idx)) {

				if (num_devs[type] >= ARRAY_SIZE(audio_idx)) {
@@ -2367,7 +2417,7 @@ int __devinit snd_hda_build_pcms(struct hda_bus *bus) 
						   "Too many audio devices\n");

						   "Too many audio devices\n");

					continue;

					continue;

				}

				}

				cpcm->device = audio_idx[num_devs[type]];

				dev = audio_idx[num_devs[type]];

				break;

				break;

			case HDA_PCM_TYPE_SPDIF:

			case HDA_PCM_TYPE_SPDIF:

			case HDA_PCM_TYPE_HDMI:

			case HDA_PCM_TYPE_HDMI:
@@ -2378,7 +2428,7 @@ int __devinit snd_hda_build_pcms(struct hda_bus *bus) 
						   dev_name[type]);

						   dev_name[type]);

					continue;

					continue;

				}

				}

				cpcm->device = dev_idx[type];

				dev = dev_idx[type];

				break;

				break;

			default:

			default:

				snd_printk(KERN_WARNING

				snd_printk(KERN_WARNING
@@ -2386,11 +2436,14 @@ int __devinit snd_hda_build_pcms(struct hda_bus *bus) 
				continue;

				continue;

			}

			}

			num_devs[type]++;

			num_devs[type]++;

			if (!cpcm->pcm) {

				cpcm->device = dev;

				err = snd_hda_attach_pcm(codec, cpcm);

				err = snd_hda_attach_pcm(codec, cpcm);

				if (err < 0)

				if (err < 0)

					return err;

					return err;

			}

			}

		}

		}

	}

	return 0;

	return 0;

}

}

sound/pci/hda/hda_codec.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -823,6 +823,7 @@ void snd_hda_codec_resume_cache(struct hda_codec *codec); 
 * Mixer

 * Mixer

 */

 */

int snd_hda_build_controls(struct hda_bus *bus);

int snd_hda_build_controls(struct hda_bus *bus);

int snd_hda_codec_build_controls(struct hda_codec *codec);





/*

/*

 * PCM

 * PCM

sound/pci/hda/hda_local.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -96,6 +96,8 @@ struct snd_kcontrol *snd_hda_find_mixer_ctl(struct hda_codec *codec, 
					    const char *name);

					    const char *name);

int snd_hda_add_vmaster(struct hda_codec *codec, char *name,

int snd_hda_add_vmaster(struct hda_codec *codec, char *name,

			unsigned int *tlv, const char **slaves);

			unsigned int *tlv, const char **slaves);

void snd_hda_codec_reset(struct hda_codec *codec);

int snd_hda_codec_configure(struct hda_codec *codec);





/* amp value bits */

/* amp value bits */

#define HDA_AMP_MUTE	0x80

#define HDA_AMP_MUTE	0x80