From 4e8b98f26035533278a1cd5c42e37cb12b10bc3d Mon Sep 17 00:00:00 2001
From: Jonathan Gray <jsg@cvs.openbsd.org>
Date: Thu, 24 Sep 2015 15:35:24 +0000
Subject: The devlist awk script didn't pickup the broadwell ids as they are
 encoded with shifts.  Switch to a file constructed by iterating through
 i915_drv.c pciidlist so these will be included.

ok kettenis@
---
 sys/dev/pci/drm/i915/i915_devlist.h | 123 +++++++++++++++++++++---------------
 1 file changed, 71 insertions(+), 52 deletions(-)

diff --git a/sys/dev/pci/drm/i915/i915_devlist.h b/sys/dev/pci/drm/i915/i915_devlist.h
index c0bf02a3630..e4395b17f43 100644
--- a/sys/dev/pci/drm/i915/i915_devlist.h
+++ b/sys/dev/pci/drm/i915/i915_devlist.h
@@ -34,10 +34,11 @@ static const struct pci_matchid i915_devices[] = {
 	{ 0x8086, 0x0102 },
 	{ 0x8086, 0x0112 },
 	{ 0x8086, 0x0122 },
-	{ 0x8086, 0x010A },
+	{ 0x8086, 0x010a },
 	{ 0x8086, 0x0106 },
 	{ 0x8086, 0x0116 },
 	{ 0x8086, 0x0126 },
+	{ 0x8086, 0x016a },
 	{ 0x8086, 0x0156 },
 	{ 0x8086, 0x0166 },
 	{ 0x8086, 0x0152 },
@@ -50,64 +51,82 @@ static const struct pci_matchid i915_devices[] = {
 	{ 0x8086, 0x040a },
 	{ 0x8086, 0x041a },
 	{ 0x8086, 0x042a },
-	{ 0x8086, 0x040B },
-	{ 0x8086, 0x041B },
-	{ 0x8086, 0x042B },
-	{ 0x8086, 0x040E },
-	{ 0x8086, 0x041E },
-	{ 0x8086, 0x042E },
-	{ 0x8086, 0x0C02 },
-	{ 0x8086, 0x0C12 },
-	{ 0x8086, 0x0C22 },
-	{ 0x8086, 0x0C0A },
-	{ 0x8086, 0x0C1A },
-	{ 0x8086, 0x0C2A },
-	{ 0x8086, 0x0C0B },
-	{ 0x8086, 0x0C1B },
-	{ 0x8086, 0x0C2B },
-	{ 0x8086, 0x0C0E },
-	{ 0x8086, 0x0C1E },
-	{ 0x8086, 0x0C2E },
-	{ 0x8086, 0x0A02 },
-	{ 0x8086, 0x0A12 },
-	{ 0x8086, 0x0A22 },
-	{ 0x8086, 0x0A0A },
-	{ 0x8086, 0x0A1A },
-	{ 0x8086, 0x0A2A },
-	{ 0x8086, 0x0A0B },
-	{ 0x8086, 0x0A1B },
-	{ 0x8086, 0x0A2B },
-	{ 0x8086, 0x0D02 },
-	{ 0x8086, 0x0D12 },
-	{ 0x8086, 0x0D22 },
-	{ 0x8086, 0x0D0A },
-	{ 0x8086, 0x0D1A },
-	{ 0x8086, 0x0D2A },
-	{ 0x8086, 0x0D0B },
-	{ 0x8086, 0x0D1B },
-	{ 0x8086, 0x0D2B },
-	{ 0x8086, 0x0D0E },
-	{ 0x8086, 0x0D1E },
-	{ 0x8086, 0x0D2E },
+	{ 0x8086, 0x040b },
+	{ 0x8086, 0x041b },
+	{ 0x8086, 0x042b },
+	{ 0x8086, 0x040e },
+	{ 0x8086, 0x041e },
+	{ 0x8086, 0x042e },
+	{ 0x8086, 0x0c02 },
+	{ 0x8086, 0x0c12 },
+	{ 0x8086, 0x0c22 },
+	{ 0x8086, 0x0c0a },
+	{ 0x8086, 0x0c1a },
+	{ 0x8086, 0x0c2a },
+	{ 0x8086, 0x0c0b },
+	{ 0x8086, 0x0c1b },
+	{ 0x8086, 0x0c2b },
+	{ 0x8086, 0x0c0e },
+	{ 0x8086, 0x0c1e },
+	{ 0x8086, 0x0c2e },
+	{ 0x8086, 0x0a02 },
+	{ 0x8086, 0x0a12 },
+	{ 0x8086, 0x0a22 },
+	{ 0x8086, 0x0a0a },
+	{ 0x8086, 0x0a1a },
+	{ 0x8086, 0x0a2a },
+	{ 0x8086, 0x0a0b },
+	{ 0x8086, 0x0a1b },
+	{ 0x8086, 0x0a2b },
+	{ 0x8086, 0x0d02 },
+	{ 0x8086, 0x0d12 },
+	{ 0x8086, 0x0d22 },
+	{ 0x8086, 0x0d0a },
+	{ 0x8086, 0x0d1a },
+	{ 0x8086, 0x0d2a },
+	{ 0x8086, 0x0d0b },
+	{ 0x8086, 0x0d1b },
+	{ 0x8086, 0x0d2b },
+	{ 0x8086, 0x0d0e },
+	{ 0x8086, 0x0d1e },
+	{ 0x8086, 0x0d2e },
 	{ 0x8086, 0x0406 },
 	{ 0x8086, 0x0416 },
 	{ 0x8086, 0x0426 },
-	{ 0x8086, 0x0C06 },
-	{ 0x8086, 0x0C16 },
-	{ 0x8086, 0x0C26 },
-	{ 0x8086, 0x0A06 },
-	{ 0x8086, 0x0A16 },
-	{ 0x8086, 0x0A26 },
-	{ 0x8086, 0x0A0E },
-	{ 0x8086, 0x0A1E },
-	{ 0x8086, 0x0A2E },
-	{ 0x8086, 0x0D06 },
-	{ 0x8086, 0x0D16 },
-	{ 0x8086, 0x0D26 },
+	{ 0x8086, 0x0c06 },
+	{ 0x8086, 0x0c16 },
+	{ 0x8086, 0x0c26 },
+	{ 0x8086, 0x0a06 },
+	{ 0x8086, 0x0a16 },
+	{ 0x8086, 0x0a26 },
+	{ 0x8086, 0x0a0e },
+	{ 0x8086, 0x0a1e },
+	{ 0x8086, 0x0a2e },
+	{ 0x8086, 0x0d06 },
+	{ 0x8086, 0x0d16 },
+	{ 0x8086, 0x0d26 },
 	{ 0x8086, 0x0f30 },
 	{ 0x8086, 0x0f31 },
 	{ 0x8086, 0x0f32 },
 	{ 0x8086, 0x0f33 },
 	{ 0x8086, 0x0157 },
 	{ 0x8086, 0x0155 },
+	{ 0x8086, 0x1602 },
+	{ 0x8086, 0x1606 },
+	{ 0x8086, 0x160b },
+	{ 0x8086, 0x160e },
+	{ 0x8086, 0x1612 },
+	{ 0x8086, 0x1616 },
+	{ 0x8086, 0x161b },
+	{ 0x8086, 0x161e },
+	{ 0x8086, 0x1622 },
+	{ 0x8086, 0x1626 },
+	{ 0x8086, 0x162b },
+	{ 0x8086, 0x162e },
+	{ 0x8086, 0x160a },
+	{ 0x8086, 0x160d },
+	{ 0x8086, 0x161a },
+	{ 0x8086, 0x161d },
+	{ 0x8086, 0x162a },
+	{ 0x8086, 0x162d },
 };
-- 
cgit v1.2.3