drm/i915: Recognise non-VGA display devices
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 20 Jan 2011 13:09:12 +0000 (13:09 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 17 Feb 2011 23:15:19 +0000 (15:15 -0800)
commit1d44f51b29d28d81d20b60fa1f811971b1d0f720
tree0a112fb7cfcfd9fb7abd1b2856119c55a9de033e
parent9cc0842a2e742afac0afdafb54062b3b38a3d486
drm/i915: Recognise non-VGA display devices

commit 934f992c763ae1e5eefcce8af769c16444085df7 upstream.

Starting with SandyBridge (though possible with earlier hacked BIOSes),
the BIOS may initialise the IGFX as secondary to a discrete GPU. Prior,
it would simply disable the integrated GPU. So we adjust our PCI class
mask to match any DISPLAY_CLASS device.

In such a configuration, the IGFX is not a primary VGA controller and
so should not take part in VGA arbitration, and the error return from
vga_client_register() is expected.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/vga/vgaarb.c