ALSA: hda: hdmi - Keep old slot assignment behavior for Intel platforms
authorTakashi Iwai <tiwai@suse.de>
Tue, 3 Dec 2019 15:41:05 +0000 (16:41 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 3 Dec 2019 19:33:05 +0000 (20:33 +0100)
commit643a2cc99b53c13d90c02dc344f780ba9a89e012
tree512ff09c6ecff8830dd76facd128ea93cd4847c2
parente38e486d66e2a3b902768fd71c32dbf10f77e1cb
ALSA: hda: hdmi - Keep old slot assignment behavior for Intel platforms

The commit 609f5485344b ("ALSA: hda: hdmi - preserve non-MST PCM
routing for Intel platforms") tried to restore the old behavior wrt
assignment of the PCM slot for Intel platforms, but this didn't do it
right.  As found in the later discussion, a positive pipe id on Intel
platforms can be passed for single monitor attachment case.

This patch reverts the previous attempt and applies a simpler
workaround instead.  Actually, for Intel platforms, we can handle as
if per_pin->dev_id=0, assign the primary slot at the first try.  This
assures the compatible behavior with the previous versions regarding
the slot assignment.

Fixes: 609f5485344b ("ALSA: hda: hdmi - preserve non-MST PCM routing for Intel platforms")
Link: https://lore.kernel.org/r/20191203154105.30414-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_hdmi.c