]> git.baikalelectronics.ru Git - kernel.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)
committerChris Wilson <chris@chris-wilson.co.uk>
Sun, 23 Jan 2011 12:52:16 +0000 (12:52 +0000)
commitc135613d978850babbd2c699dfbc3b696276b6b6
tree782f06fc0cf77813499d3d77e47a23c0f613625e
parentedbab37ad290e5e2a23c7e5c12cf04fb947c7848
drm/i915: Recognise non-VGA display devices

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>
Cc: stable@kernel.org
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/vga/vgaarb.c