From 8d1cb54aaca7adaf3e0a4d227f5a7f5ba660fee7 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Fri, 22 Apr 2016 22:41:52 -0500
Subject: [PATCH] intel_extreme: Add in some code for the lakes (unused)

---
 .../graphics/intel_extreme/intel_extreme.h       |  8 +++++++-
 .../drivers/graphics/intel_extreme/driver.cpp    | 16 ++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/headers/private/graphics/intel_extreme/intel_extreme.h b/headers/private/graphics/intel_extreme/intel_extreme.h
index fe4b9b20ef..ef5151b2ac 100644
--- a/headers/private/graphics/intel_extreme/intel_extreme.h
+++ b/headers/private/graphics/intel_extreme/intel_extreme.h
@@ -32,6 +32,7 @@
 #define INTEL_FAMILY_SER5	0x00080000	// Intel5 Series
 #define INTEL_FAMILY_POVR	0x00100000	// PowerVR (uugh)
 #define INTEL_FAMILY_SOC0	0x00200000  // Atom SOC
+#define INTEL_FAMILY_LAKE	0x00400000	// Intel Lakes
 // groups
 #define INTEL_GROUP_83x		(INTEL_FAMILY_8xx  | 0x0010)
 #define INTEL_GROUP_85x		(INTEL_FAMILY_8xx  | 0x0020)
@@ -50,6 +51,8 @@
 #define INTEL_GROUP_VLV		(INTEL_FAMILY_SOC0 | 0x0010)  // ValleyView
 #define INTEL_GROUP_CHV		(INTEL_FAMILY_SOC0 | 0x0020)  // CherryView
 #define INTEL_GROUP_BXT		(INTEL_FAMILY_SOC0 | 0x0040)  // Broxton
+#define INTEL_GROUP_SKY		(INTEL_FAMILY_LAKE | 0x0010)  // SkyLake
+#define INTEL_GROUP_KBY		(INTEL_FAMILY_LAKE | 0x0020)  // KabyLake
 // models
 #define INTEL_TYPE_SERVER	0x0004
 #define INTEL_TYPE_MOBILE	0x0008
@@ -76,6 +79,9 @@
 #define INTEL_MODEL_HASM	(INTEL_GROUP_HAS | INTEL_TYPE_MOBILE)
 #define INTEL_MODEL_VLV		(INTEL_GROUP_VLV)
 #define INTEL_MODEL_VLVM	(INTEL_GROUP_VLV | INTEL_TYPE_MOBILE)
+#define INTEL_MODEL_SKY		(INTEL_GROUP_SKY)
+#define INTEL_MODEL_SKYM	(INTEL_GROUP_SKY | INTEL_TYPE_MOBILE)
+#define INTEL_MODEL_SKYS	(INTEL_GROUP_SKY | INTEL_TYPE_SERVER)
 
 // ValleyView MMIO offset
 #define VLV_DISPLAY_BASE		0x180000
@@ -187,7 +193,7 @@ struct DeviceType {
 			return 7;
 		if (InGroup(INTEL_GROUP_CHV))
 			return 8;
-		if (InGroup(INTEL_GROUP_BXT))
+		if (InGroup(INTEL_GROUP_BXT) || InFamily(INTEL_FAMILY_LAKE))
 			return 9;
 
 		// Generation 0 means somethins is wrong :-)
diff --git a/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp b/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp
index a13c4be30b..c092c331e9 100644
--- a/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp
+++ b/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp
@@ -110,6 +110,22 @@ const struct supported_device {
 	{0x0f32, INTEL_MODEL_VLVM, "ValleyView Mobile"},
 	{0x0f33, INTEL_MODEL_VLVM, "ValleyView Mobile"},
 	{0x0157, INTEL_MODEL_VLVM, "ValleyView Mobile"},
+
+	{0x1902, INTEL_MODEL_SKY,  "Skylake GT1"},
+	{0x1906, INTEL_MODEL_SKYM, "Skylake GT1"},
+	{0x190a, INTEL_MODEL_SKYS, "Skylake GT1"},
+	{0x190b, INTEL_MODEL_SKY,  "Skylake GT1"},
+	{0x190e, INTEL_MODEL_SKYM, "Skylake GT1"},
+	{0x1912, INTEL_MODEL_SKY,  "Skylake GT2"},
+	{0x1916, INTEL_MODEL_SKYM, "Skylake GT2"},
+	{0x191a, INTEL_MODEL_SKYS, "Skylake GT2"},
+	{0x191b, INTEL_MODEL_SKY,  "Skylake GT2"},
+	{0x191d, INTEL_MODEL_SKY,  "Skylake GT2"},
+	{0x191e, INTEL_MODEL_SKYM, "Skylake GT2"},
+	{0x1921, INTEL_MODEL_SKYM, "Skylake GT2F"},
+	{0x1926, INTEL_MODEL_SKYM, "Skylake GT3"},
+	{0x192a, INTEL_MODEL_SKYS, "Skylake GT3"},
+	{0x192b, INTEL_MODEL_SKY,  "Skylake GT3"},
 #endif
 };