From: jsg <jsg@openbsd.org>
Date: Mon, 22 Jan 2018 02:28:09 +0000 (+0000)
Subject: Match on Iris Pro Graphics 580 and other skylake GT4 ids and correct
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=9ff3512897ccc01cc705090317b8a7f5175a464b;p=openbsd

Match on Iris Pro Graphics 580 and other skylake GT4 ids and correct
the Iris Graphics P555 GT3 id.

Derived from the following linux commits:

drm/i915/skl: Add SKL GT4 PCI IDs
From Mika Kuoppala
15620206ae87ba9643ffa6f5ddb5471be7192006 in mainline linux

drm/i915: Update SKL SRV GT4 pci ids reference.
From Rodrigo Vivi
5390974f981907cd02d1cb48145b03471279877a in mainline linux

drm/i915/skl: Add missing SKL ID
From Michal Winiarski
ca7a45ba6fb9e7ceca56d10b91db29c2f3451a2e in mainline linux

Expanded version of a diff from ccardenas@.
Reported and tested by Bryan Vyhmeister.
Tested by and ok ccardenas@
---

diff --git a/sys/dev/pci/drm/i915/i915_devlist.h b/sys/dev/pci/drm/i915/i915_devlist.h
index 684d3c4d39d..e24e165ec1b 100644
--- a/sys/dev/pci/drm/i915/i915_devlist.h
+++ b/sys/dev/pci/drm/i915/i915_devlist.h
@@ -148,7 +148,12 @@ static const struct pci_matchid i915_devices[] = {
 	{ 0x8086, 0x1926 },
 	{ 0x8086, 0x1927 },
 	{ 0x8086, 0x192b },
+	{ 0x8086, 0x192d },
+	{ 0x8086, 0x1932 },
+	{ 0x8086, 0x193b },
+	{ 0x8086, 0x193d },
 	{ 0x8086, 0x192a },
+	{ 0x8086, 0x193a },
 	{ 0x8086, 0x0a84 },
 	{ 0x8086, 0x1a84 },
 	{ 0x8086, 0x1a85 },
diff --git a/sys/dev/pci/drm/i915/i915_drv.c b/sys/dev/pci/drm/i915/i915_drv.c
index 4f352ea7dd0..aa3361110a1 100644
--- a/sys/dev/pci/drm/i915/i915_drv.c
+++ b/sys/dev/pci/drm/i915/i915_drv.c
@@ -468,6 +468,7 @@ static const struct intel_device_info intel_kabylake_gt3_info = {
 	INTEL_SKL_GT1_IDS(&intel_skylake_info),	\
 	INTEL_SKL_GT2_IDS(&intel_skylake_info),	\
 	INTEL_SKL_GT3_IDS(&intel_skylake_gt3_info),	\
+	INTEL_SKL_GT4_IDS(&intel_skylake_gt3_info),	\
 	INTEL_BXT_IDS(&intel_broxton_info),		\
 	INTEL_KBL_GT1_IDS(&intel_kabylake_info),	\
 	INTEL_KBL_GT2_IDS(&intel_kabylake_info),	\
diff --git a/sys/dev/pci/drm/i915_pciids.h b/sys/dev/pci/drm/i915_pciids.h
index 7887ca0f82d..d29c6b6ec40 100644
--- a/sys/dev/pci/drm/i915_pciids.h
+++ b/sys/dev/pci/drm/i915_pciids.h
@@ -281,12 +281,20 @@
 	INTEL_VGA_DEVICE(0x1926, info), /* ULT GT3 */ \
 	INTEL_VGA_DEVICE(0x1927, info), /* ULT GT3 */ \
 	INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3 */ \
-	INTEL_VGA_DEVICE(0x192A, info) /* SRV GT3 */ \
+	INTEL_VGA_DEVICE(0x192D, info) /* SRV GT3 */ \
+
+#define INTEL_SKL_GT4_IDS(info) \
+	INTEL_VGA_DEVICE(0x1932, info), /* DT GT4 */ \
+	INTEL_VGA_DEVICE(0x193B, info), /* Halo GT4 */ \
+	INTEL_VGA_DEVICE(0x193D, info), /* WKS GT4 */ \
+	INTEL_VGA_DEVICE(0x192A, info), /* SRV GT4 */ \
+	INTEL_VGA_DEVICE(0x193A, info)  /* SRV GT4e */
 
 #define INTEL_SKL_IDS(info) \
 	INTEL_SKL_GT1_IDS(info), \
 	INTEL_SKL_GT2_IDS(info), \
-	INTEL_SKL_GT3_IDS(info)
+	INTEL_SKL_GT3_IDS(info), \
+	INTEL_SKL_GT4_IDS(info)
 
 #define INTEL_BXT_IDS(info) \
 	INTEL_VGA_DEVICE(0x0A84, info), \