ALSA: hda - Increase badness for missing multi-io

The current badness value used for the missing multi-io seems too
weak, and the multi-io tends to be skipped for desktop configurations
when no enough DACs are available.  It's because the total badness of
the multi-io becomes often larger than the badness with assigning an
individual DAC to a headphone jack.  This is good for one side, but it
seems that the surround outputs are more demanded by that.

This patch increases the badness value for the missing multi-io
slightly so that the multi-io would be preferred than the individual
headphone DAC if they conflict.  Through the tests with hda-emu,
mostly only desktop configurations with ALC662/663 and CMI codecs are
affected by this change, and all look reasonable.

Reported-by: Raymond Yau <superquad.vortex2@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 6af5ade..78897d0 100644 (file)
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -988,7 +988,7 @@ enum {
        /* No DAC is found for the extra output */
        BAD_NO_DAC = 0x4000,
        /* No possible multi-ios */
-       BAD_MULTI_IO = 0x103,
+       BAD_MULTI_IO = 0x120,
        /* No individual DAC for extra output */
        BAD_NO_EXTRA_DAC = 0x102,
        /* No individual DAC for extra surrounds */