From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 7 Jun 2012 10:15:16 +0000 (+0200)
Subject: ALSA: hda - Fix uninitialized HDMI controllers with VGA-switcheroo
X-Git-Tag: v3.5-rc3~21^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=12b78a7f671aa91fd41899615bf6d171c925c3d7;p=platform%2Fkernel%2Flinux-3.10.git

ALSA: hda - Fix uninitialized HDMI controllers with VGA-switcheroo

When VGA-switcheroo is built in but unused on systems with multiple
graphics cards, the initializations of non-default graphics cards are
skipped and never enabled (because the switcheroo is activated only
when the controller supports).  The current behavior is for avoiding
the system lockup by accessing the disabled GPU, but due to the recent
change in VGA-switcheroo, it determines the state simply by checking
with the default VGA device.  This is the culprit.

Now with the new vga_switcheroo_get_client_state(), we can know the
initial state of the bound GPU, thus can determine the initial audio
client state more correctly.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 2b6392b..5f0375f 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2670,7 +2670,7 @@ static bool __devinit check_hdmi_disabled(struct pci_dev *pci)
 	struct pci_dev *p = get_bound_vga(pci);
 
 	if (p) {
-		if (vga_default_device() && p != vga_default_device())
+		if (vga_switcheroo_get_client_state(p) == VGA_SWITCHEROO_OFF)
 			vga_inactive = true;
 		pci_dev_put(p);
 	}