From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue, 11 Oct 2011 08:59:05 +0000 (+0200)
Subject: drm/i915: only match on PCI_BASE_CLASS_DISPLAY
X-Git-Tag: firefly_0821_release~3680^2~4055^2~5^2~23
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=80a2901d2a59946d098c4479d650d0c3c82c3d85;p=firefly-linux-kernel-4.4.55.git

drm/i915: only match on PCI_BASE_CLASS_DISPLAY

... not DISPLAY_VGA, because we ignore the VGA subclass with our
class_mask.

It confused me until Chris Wilson clued me up.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 4c8d681c2151..548e04bade3c 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -106,7 +106,7 @@ static struct drm_driver driver;
 extern int intel_agp_enabled;
 
 #define INTEL_VGA_DEVICE(id, info) {		\
-	.class = PCI_CLASS_DISPLAY_VGA << 8,	\
+	.class = PCI_BASE_CLASS_DISPLAY << 16,	\
 	.class_mask = 0xff0000,			\
 	.vendor = 0x8086,			\
 	.device = id,				\