From: Chris Wilson Date: Thu, 20 Jan 2011 13:09:12 +0000 (+0000) Subject: drm/i915: Recognise non-VGA display devices X-Git-Tag: v2.6.37.1~10 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d44f51b29d28d81d20b60fa1f811971b1d0f720;p=pandora-kernel.git 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 Signed-off-by: Greg Kroah-Hartman --- Reading git-diff-tree failed