Re: [PATCH] ALSA: hda - HDMI Audio init all connectors

[Takashi Iwai]

At the next time you submit a patch, please add Cc to maintainer and
subsystem ML.  Otherwise it'd be easily overlooked.

At Thu, 07 Jun 2012 06:52:59 +0100,
Steven Newbury wrote:
> 
> When VGA_SWITCHEROO support is enabled hda_intel initialises the HDMI audio device on the current VGA device.  When it's not enabled it only initialises the HDMI device on the default VGA adaptor, this means secondary cards get no audio support which is very unhelpful for multi-seat!
> 
> With this patch, when SUPPORT_VGA_SWITCHEROO is disabled hda_intel initialises all HDMI audio devices, not just the default VGA.
> 
> Signed-off-by: Steven Newbury <steve@xxxxxxxxxxxxxxx>

OK, it must be fixed indeed.  The bug was introduced due to the change
in VGA-switcheroo side -- originally check_hdmi_disabled() really
checked the VGA-switcheroo state, so it returned the correct value in
the earlier version.

In anyway, your patch looks almost OK, but it'd be better to move
ifdef and simplify like below.  Could you check whether it works for
you?

Also, please give a patch that is applicable directly via git-am.
Apparently you created it via git show.  Instead, use git-format-patch
or use --pretty=email for git-show.  Or, send the patch directly via
git-send-email.


thanks,

Takashi

---
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 2b6392b..2eb1b47 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2484,9 +2484,9 @@ static void azx_notifier_unregister(struct azx *chip)
 static int DELAYED_INIT_MARK azx_first_init(struct azx *chip);
 static int DELAYED_INIT_MARK azx_probe_continue(struct azx *chip);
 
+#ifdef SUPPORT_VGA_SWITCHEROO
 static struct pci_dev __devinit *get_bound_vga(struct pci_dev *pci);
 
-#ifdef SUPPORT_VGA_SWITCHEROO
 static void azx_vs_set_state(struct pci_dev *pci,
 			     enum vga_switcheroo_state state)
 {
@@ -2578,6 +2578,7 @@ static int __devinit register_vga_switcheroo(struct azx *chip)
 #else
 #define init_vga_switcheroo(chip)		/* NOP */
 #define register_vga_switcheroo(chip)		0
+#define check_hdmi_disabled(pci)	false
 #endif /* SUPPORT_VGA_SWITCHER */
 
 /*
@@ -2638,6 +2639,7 @@ static int azx_dev_free(struct snd_device *device)
 	return azx_free(device->device_data);
 }
 
+#ifdef SUPPORT_VGA_SWITCHEROO
 /*
  * Check of disabled HDMI controller by vga-switcheroo
  */
@@ -2676,6 +2678,7 @@ static bool __devinit check_hdmi_disabled(struct pci_dev *pci)
 	}
 	return vga_inactive;
 }
+#endif /* SUPPORT_VGA_SWITCHEROO */
 
 /*
  * white/black-listing for position_fix
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/