commit 128960a9ad67e2d119738f5211956e0304517551 Author: Takashi Iwai Date: Fri Oct 12 17:28:18 2012 +0200 ALSA: hda - Fix registration race of VGA switcheroo Delay the registration of VGA switcheroo client to the end of the probing. Otherwise a too quick switching may result in Oops during probing. Also add the check of the return value from snd_hda_lock_devices(). Reported-and-tested-by: Daniel J Blueman Cc: [v3.5+] Signed-off-by: Takashi Iwai commit e99eac5e4ea3bd8671bb1cedad10c3fec90ec0de Author: Seth Forshee Date: Fri Aug 17 11:17:02 2012 -0500 vga_switcheroo: Don't require handler init callback This callback is a no-op in nouveau, and the upcoming apple-gmux switcheroo support won't require it either. Rather than forcing drivers to stub it out, just make it optional and remove the callback from nouveau. Signed-off-by: Seth Forshee Signed-off-by: Matthew Garrett commit 36704c0c4c64f889d77158d497f6a7e596d1341c Author: Seth Forshee Date: Fri Aug 17 11:17:03 2012 -0500 vga_switcheroo: Remove assumptions about registration/unregistration ordering vga_switcheroo assumes that the handler will be registered before the last client, otherwise switching will not be enabled. Likewise it's assumed that the handler will not be unregistered without at least one client also being unregistered, otherwise switching will remain enabled despite no longer having a handler. These assumptions cannot be enforced if the handler is in a separate driver from both clients, as with the gmux found in Apple laptops. Remove this assumption. Signed-off-by: Seth Forshee Signed-off-by: Matthew Garrett commit 76b487dd5187a4d7cc6eccd452f65467a8c7768b Author: Andreas Heider Date: Fri Aug 17 11:17:04 2012 -0500 apple-gmux: Add display mux support Add support for the gmux display muxing functionality and register a mux handler with vga_switcheroo. Signed-off-by: Andreas Heider Signed-off-by: Seth Forshee Signed-off-by: Matthew Garrett