hda/hdmi: Register with vga_switcheroo on Dual GPU Macbooks
PATCH v2 1/1 hda/hdmi: Register with vga_switcheroo on Dual GPU Macbooks
Commit 586bc4aab878 ("ALSA: hda/hdmi - fix vgaswitcheroo detection for AMD") caused only AMD gpu's with PX to have their audio component register with vga_switcheroo. This meant that Apple Macbooks with apple-gmux as the gpu switcher no longer had the audio client registering, so when the gpu is powered off by vga_switcheroo snd_hda_intel is unaware that it should have suspended the device:
amdgpu: switched offsnd_hda_intel 0000:03:00.1:
Unable to change power state from D3hot to D0, device inaccessiblesnd_hda_intel 0000:03:00.1: CORB reset timeout#2, CORBRP = 65535
To resolve this, we use apple_gmux_detect() and register a vga_switcheroo audio client when apple-gmux is detected.
---v1->v2: Use apple_gmux_detect(), split this patch out of the patch series
sound/pci/hda/hda_intel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/pci/hda/hda_intel.c +2 -1
@@ -50,6 +50,7 @@#include <sound/intel-dsp-config.h> #include <linux/vgaarb.h> #include <linux/vga_switcheroo.h> +#include <linux/apple-gmux.h> #include <linux/firmware.h> #include <sound/hda_codec.h> #include "hda_controller.h"
@@ -1463,7 +1464,7 @@ static struct pci_dev *get_bound_vga(struct pci_dev *pci)* vgaswitcheroo. */ if (((p->class >>16 ) ==PCI_BASE_CLASS_DISPLAY ) && -atpx_present ()) + (atpx_present () ||apple_gmux_detect (NULL ,NULL )))return p;pci_dev_put (p); }
Signature · 1 line
2.39.1
Takashi Iwai
AppliedQuoted 16 lines · Orlando Chamberlain
Commit
586bc4aab878("ALSA: hda/hdmi - fix vgaswitcheroo detection for AMD") caused only AMD gpu's with PX to have their audio component register withvga_switcheroo. This meant that Apple Macbooks with apple-gmux as the gpu switcher no longer had the audio client registering, so when the gpu is powered off byvga_switcheroosnd_hda_intelis unaware that it should have suspended the device:amdgpu: switched off
snd_hda_intel0000:03:00.1:
Unable to change power state from D3hot to D0, device inaccessiblesnd_hda_intel0000:03:00.1: CORB reset timeout#2, CORBRP = 65535To resolve this, we use
apple_gmux_detect()and register avga_switcherooaudio client when apple-gmux is detected.
Quoted 6 lines
Fixes 586bc4aab878 ("ALSA: hda/hdmi - fix vgaswitcheroo detection for AMD")Signed-off-by Orlando Chamberlain <[email protected]>---
v1->v2: Useapple_gmux_detect(), split this patch out of the patch series
Thanks, applied now.
Takashi