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

Commit d0fa15e0 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into topic/hda

parents 36e9c135 0bbaee3a

sound/pci/hda/hda_eld.c

+10 −14
Original line number Diff line number Diff line
@@ -189,6 +189,9 @@ static void hdmi_update_short_audio_desc(struct cea_sad *a, 
	a->channels = GRAB_BITS(buf, 0, 0, 3);

	a->channels++;



	a->sample_bits = 0;

	a->max_bitrate = 0;



	a->format = GRAB_BITS(buf, 0, 3, 4);

	switch (a->format) {

	case AUDIO_CODING_TYPE_REF_STREAM_HEADER:
@@ -198,7 +201,6 @@ static void hdmi_update_short_audio_desc(struct cea_sad *a, 


	case AUDIO_CODING_TYPE_LPCM:

		val = GRAB_BITS(buf, 2, 0, 3);

		a->sample_bits = 0;

		for (i = 0; i < 3; i++)

			if (val & (1 << i))

				a->sample_bits |= cea_sample_sizes[i + 1];
@@ -598,24 +600,19 @@ void hdmi_eld_update_pcm_info(struct hdmi_eld *eld, struct hda_pcm_stream *pcm, 
{

	int i;



	pcm->rates = 0;

	pcm->formats = 0;

	pcm->maxbps = 0;

	pcm->channels_min = -1;

	pcm->channels_max = 0;

	/* assume basic audio support (the basic audio flag is not in ELD;

	 * however, all audio capable sinks are required to support basic

	 * audio) */

	pcm->rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000;

	pcm->formats = SNDRV_PCM_FMTBIT_S16_LE;

	pcm->maxbps = 16;

	pcm->channels_max = 2;

	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)
@@ -635,7 +632,6 @@ void hdmi_eld_update_pcm_info(struct hdmi_eld *eld, struct hda_pcm_stream *pcm, 
	/* 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);

}

sound/pci/hda/hda_intel.c

+1 −0
Original line number Diff line number Diff line
@@ -2296,6 +2296,7 @@ static int azx_dev_free(struct snd_device *device) 
 */

static struct snd_pci_quirk position_fix_list[] __devinitdata = {

	SND_PCI_QUIRK(0x1025, 0x009f, "Acer Aspire 5110", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1025, 0x026f, "Acer Aspire 5538", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1028, 0x01cc, "Dell D820", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1028, 0x01de, "Dell Precision 390", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1028, 0x01f6, "Dell Latitude 131L", POS_FIX_LPIB),

sound/pci/hda/patch_conexant.c

+1 −0
Original line number Diff line number Diff line
@@ -3111,6 +3111,7 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5),

	SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400s", CXT5066_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x21b2, "Thinkpad X100e", CXT5066_IDEAPAD),

	SND_PCI_QUIRK(0x17aa, 0x21c5, "Thinkpad Edge 13", CXT5066_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x21b3, "Thinkpad Edge 13 (197)", CXT5066_IDEAPAD),

	SND_PCI_QUIRK(0x17aa, 0x21b4, "Thinkpad Edge", CXT5066_IDEAPAD),

	SND_PCI_QUIRK(0x17aa, 0x21c8, "Thinkpad Edge 11", CXT5066_IDEAPAD),

sound/pci/hda/patch_hdmi.c

+0 −1
Original line number Diff line number Diff line
@@ -834,7 +834,6 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo, 
			return -ENODEV;

	} else {

		/* fallback to the codec default */

		hinfo->channels_min = codec_pars->channels_min;

		hinfo->channels_max = codec_pars->channels_max;

		hinfo->rates = codec_pars->rates;

		hinfo->formats = codec_pars->formats;