As reported by Andreas Noever Apple computers with both integrated Intel GPU and discrete NVidia GPU fail to boot properly with 20cde694027e that landed in 3.17-rc1.

The reason is that that patch stopped forcefully setting default_vga_device according to screen_info memory ownership but did just set first PCI device configured that had both IO and memory resources enabled.

Patch https://patchwork.kernel.org/patch/4771201/ (should be applied with Reported-and-Tested-by: Andreas instead of just reported-by) fixes this by moving the code originally in efifb to vgaarb's init() function and overriding the selection performed while registering PCI vga devices with vgaarb.

Patch https://patchwork.kernel.org/patch/4771211/ should go in at the same time (though not mandatory). It cleans up a few defines not used anymore that were left behind by commit 20cde694027e.