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

Commit 18c5ef38 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into for-linus

parents 38d7b08f f0cea797

sound/pci/hda/hda_codec.c

+18 −8
Original line number Diff line number Diff line
@@ -1261,12 +1261,17 @@ void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid, 
}

EXPORT_SYMBOL_HDA(snd_hda_codec_setup_stream);



static void really_cleanup_stream(struct hda_codec *codec,

				  struct hda_cvt_setup *q);



/**

 * snd_hda_codec_cleanup_stream - clean up the codec for closing

 * __snd_hda_codec_cleanup_stream - clean up the codec for closing

 * @codec: the CODEC to clean up

 * @nid: the NID to clean up

 * @do_now: really clean up the stream instead of clearing the active flag

 */

void snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid)

void __snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid,

				    int do_now)

{

	struct hda_cvt_setup *p;
@@ -1274,14 +1279,19 @@ void snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid) 
		return;



	snd_printdd("hda_codec_cleanup_stream: NID=0x%x\n", nid);

	/* here we just clear the active flag; actual clean-ups will be done

	 * in purify_inactive_streams()

	 */

	p = get_hda_cvt_setup(codec, nid);

	if (p)

	if (p) {

		/* here we just clear the active flag when do_now isn't set;

		 * actual clean-ups will be done later in

		 * purify_inactive_streams() called from snd_hda_codec_prpapre()

		 */

		if (do_now)

			really_cleanup_stream(codec, p);

		else

			p->active = 0;

	}

EXPORT_SYMBOL_HDA(snd_hda_codec_cleanup_stream);

}

EXPORT_SYMBOL_HDA(__snd_hda_codec_cleanup_stream);



static void really_cleanup_stream(struct hda_codec *codec,

				  struct hda_cvt_setup *q)

sound/pci/hda/hda_codec.h

+4 −1
Original line number Diff line number Diff line
@@ -963,7 +963,10 @@ void snd_hda_codec_cleanup(struct hda_codec *codec, 
void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid,

				u32 stream_tag,

				int channel_id, int format);

void snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid);

void __snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid,

				    int do_now);

#define snd_hda_codec_cleanup_stream(codec, nid) \

	__snd_hda_codec_cleanup_stream(codec, nid, 0)

unsigned int snd_hda_calc_stream_format(unsigned int rate,

					unsigned int channels,

					unsigned int format,

sound/pci/hda/hda_eld.c

+49 −0
Original line number Diff line number Diff line
@@ -596,4 +596,53 @@ void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld) 
}

EXPORT_SYMBOL_HDA(snd_hda_eld_proc_free);



/* update PCM info based on ELD */

void hdmi_eld_update_pcm_info(struct hdmi_eld *eld, struct hda_pcm_stream *pcm,

			      struct hda_pcm_stream *codec_pars)

{

	int i;



	pcm->rates = 0;

	pcm->formats = 0;

	pcm->maxbps = 0;

	pcm->channels_min = -1;

	pcm->channels_max = 0;

	for (i = 0; i < eld->sad_count; i++) {

		struct cea_sad *a = &eld->sad[i];

		pcm->rates |= a->rates;

		if (a->channels < pcm->channels_min)

			pcm->channels_min = a->channels;

		if (a->channels > pcm->channels_max)

			pcm->channels_max = a->channels;

		if (a->format == AUDIO_CODING_TYPE_LPCM) {

			if (a->sample_bits & AC_SUPPCM_BITS_16) {

				pcm->formats |= SNDRV_PCM_FMTBIT_S16_LE;

				if (pcm->maxbps < 16)

					pcm->maxbps = 16;

			}

			if (a->sample_bits & AC_SUPPCM_BITS_20) {

				pcm->formats |= SNDRV_PCM_FMTBIT_S32_LE;

				if (pcm->maxbps < 20)

					pcm->maxbps = 20;

			}

			if (a->sample_bits & AC_SUPPCM_BITS_24) {

				pcm->formats |= SNDRV_PCM_FMTBIT_S32_LE;

				if (pcm->maxbps < 24)

					pcm->maxbps = 24;

			}

		}

	}



	if (!codec_pars)

		return;



	/* restrict the parameters by the values the codec provides */

	pcm->rates &= codec_pars->rates;

	pcm->formats &= codec_pars->formats;

	pcm->channels_min = max(pcm->channels_min, codec_pars->channels_min);

	pcm->channels_max = min(pcm->channels_max, codec_pars->channels_max);

	pcm->maxbps = min(pcm->maxbps, codec_pars->maxbps);

}

EXPORT_SYMBOL_HDA(hdmi_eld_update_pcm_info);



#endif /* CONFIG_PROC_FS */

sound/pci/hda/hda_local.h

+2 −0
Original line number Diff line number Diff line
@@ -604,6 +604,8 @@ struct hdmi_eld { 
int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid);

int snd_hdmi_get_eld(struct hdmi_eld *, struct hda_codec *, hda_nid_t);

void snd_hdmi_show_eld(struct hdmi_eld *eld);

void hdmi_eld_update_pcm_info(struct hdmi_eld *eld, struct hda_pcm_stream *pcm,

			      struct hda_pcm_stream *codec_pars);



#ifdef CONFIG_PROC_FS

int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld,

sound/pci/hda/patch_cirrus.c

+1 −1
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ static int change_cur_input(struct hda_codec *codec, unsigned int idx, 
		return 0;

	if (spec->cur_adc && spec->cur_adc != spec->adc_nid[idx]) {

		/* stream is running, let's swap the current ADC */

		snd_hda_codec_cleanup_stream(codec, spec->cur_adc);

		__snd_hda_codec_cleanup_stream(codec, spec->cur_adc, 1);

		spec->cur_adc = spec->adc_nid[idx];

		snd_hda_codec_setup_stream(codec, spec->cur_adc,

					   spec->cur_adc_stream_tag, 0,