浏览代码

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>
Takashi Iwai 13 年之前
父节点
当前提交
12b78a7f67
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      sound/pci/hda/hda_intel.c

+ 1 - 1
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);
 	struct pci_dev *p = get_bound_vga(pci);
 
 
 	if (p) {
 	if (p) {
-		if (vga_default_device() && p != vga_default_device())
+		if (vga_switcheroo_get_client_state(p) == VGA_SWITCHEROO_OFF)
 			vga_inactive = true;
 			vga_inactive = true;
 		pci_dev_put(p);
 		pci_dev_put(p);
 	}
 	}