]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
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 22:47:31 +0000 (14:47 -0800)
commit02a9f4dfb9318e84e6c46cd08adb286cfeaf87eb
treedcdc294a671c2512f9e2dcf46b3fea830e1bd5fd
parent5cc301295c277a59cb8ae9c529b6b1ef130fef0c
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