ALSA: hda - Do not wrongly restrict min_channels based on ELD (4b0dbdb1) · Commits · 戴 / test

Commit added functionality to restrict PCM parameters based on ELD info (derived from EDID data) of the audio sink. However, it wrongly assumes that the bits 0-2 of the first byte of CEA Short Audio Descriptors mean a supported number of channels. In reality, they mean the maximum number of channels (as per CEA-861-D 7.5.2). This means that the channel count can only be used to restrict max_channels, not min_channels. Restricting min_channels causes us to deny opening the device in stereo mode if the sink only has SADs that declare larger numbers of channels (like Primare SP32 AV Processor does). Fix that by not restricting min_channels based on ELD information. Signed-off-by:

Anssi Hannula <anssi.hannula@iki.fi> Reported-by:

Jean-Yves Avenard <jyavenard@gmail.com> Tested-by:

Jean-Yves Avenard <jyavenard@gmail.com> Cc: stable@kernel.org Signed-off-by:

Takashi Iwai <tiwai@suse.de>

sound/pci/hda/hda_eld.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -601,13 +601,10 @@ void hdmi_eld_update_pcm_info(struct hdmi_eld eld, struct hda_pcm_stream pcm,
		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) {
		@@ -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/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;

Admin message