[Intel-gfx] [PATCH] drm/i915: Add 0x2a43, a Cantiga device

[Damien Lespiau]

While browsing the nice list of Intel GPU devices on wikipedia [1], I
noticed that we don't have 0x2a43 in the list of Cantiga devices in our
driver. Turns out this device seems to be out there:

 * It's in the pciids database http://pci-ids.ucw.cz/read/PC/8086/2a43
 * I found a mention of that device on the mesa ml:
   http://comments.gmane.org/gmane.comp.video.mesa3d.devel/39899
   (but we don't support it in either libdrm or mesa)?

[1] http://en.wikipedia.org/wiki/Comparison_of_Intel_graphics_processing_units

Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c | 1 +
 drivers/gpu/drm/i915/i915_drv.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 70b64fd..eff5788 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -350,6 +350,7 @@ static const struct pci_device_id pciidlist[] = {		/* aka */
 	INTEL_VGA_DEVICE(0x2a02, &intel_i965gm_info),		/* I965_GM */
 	INTEL_VGA_DEVICE(0x2a12, &intel_i965gm_info),		/* I965_GME */
 	INTEL_VGA_DEVICE(0x2a42, &intel_gm45_info),		/* GM45_G */
+	INTEL_VGA_DEVICE(0x2a43, &intel_gm45_info),
 	INTEL_VGA_DEVICE(0x2e02, &intel_g45_info),		/* IGD_E_G */
 	INTEL_VGA_DEVICE(0x2e12, &intel_g45_info),		/* Q45_G */
 	INTEL_VGA_DEVICE(0x2e22, &intel_g45_info),		/* G45_G */
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 10a56c9..b73ccf1 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1413,7 +1413,7 @@ struct drm_i915_file_private {
 #define IS_I945GM(dev)		(INTEL_INFO(dev)->is_i945gm)
 #define IS_BROADWATER(dev)	(INTEL_INFO(dev)->is_broadwater)
 #define IS_CRESTLINE(dev)	(INTEL_INFO(dev)->is_crestline)
-#define IS_GM45(dev)		((dev)->pci_device == 0x2A42)
+#define IS_GM45(dev)		(((dev)->pci_device & 0xfff0) == 0x2a40)
 #define IS_G4X(dev)		(INTEL_INFO(dev)->is_g4x)
 #define IS_PINEVIEW_G(dev)	((dev)->pci_device == 0xa001)
 #define IS_PINEVIEW_M(dev)	((dev)->pci_device == 0xa011)
-- 
1.8.1.4