From 3fedf64872f403c776722a0b5a1a2473a31f1323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Sun, 28 Nov 2021 13:30:26 +0100
Subject: [PATCH] intel_extreme: enable KabyLake
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I81d04fdf8305efcc9250cfb975dd3466ebcb4058
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4740
Reviewed-by: Jérôme Duval <jerome.duval@gmail.com>
---
 .../private/graphics/intel_extreme/intel_extreme.h   |  2 ++
 src/add-ons/kernel/busses/agp_gart/intel_gart.cpp    | 12 ++++++++++++
 .../kernel/drivers/graphics/intel_extreme/driver.cpp | 12 ++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/headers/private/graphics/intel_extreme/intel_extreme.h b/headers/private/graphics/intel_extreme/intel_extreme.h
index f46968b167..02f8e760f0 100644
--- a/headers/private/graphics/intel_extreme/intel_extreme.h
+++ b/headers/private/graphics/intel_extreme/intel_extreme.h
@@ -84,6 +84,8 @@
 #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)
+#define INTEL_MODEL_KBY		(INTEL_GROUP_KBY)
+#define INTEL_MODEL_KBYM	(INTEL_GROUP_KBY | INTEL_TYPE_MOBILE)
 #define INTEL_MODEL_CFL		(INTEL_GROUP_CFL)
 #define INTEL_MODEL_CFLM	(INTEL_GROUP_CFL | INTEL_TYPE_MOBILE)
 #define INTEL_MODEL_CML		(INTEL_GROUP_CML)
diff --git a/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp b/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
index 8dfaf1d95b..d2076504e5 100644
--- a/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
+++ b/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
@@ -143,6 +143,18 @@ const struct supported_device {
 	{0x1904, 0x192a, INTEL_MODEL_SKYS, "Skylake GT3"},
 	{0x1904, 0x192b, INTEL_MODEL_SKY,  "Skylake GT3"},
 
+	{0x5904, 0x5906, INTEL_MODEL_KBY,  "Kabylake ULT GT1"},
+	{0x590f, 0x5902, INTEL_MODEL_KBY,  "Kabylake DT GT1"},
+	{0x590c, 0x5916, INTEL_MODEL_KBY,  "Kabylake ULT GT2"},
+	{0x590c, 0x591c, INTEL_MODEL_KBY,  "Kabylake ULX GT2"},
+	{0x590c, 0x591e, INTEL_MODEL_KBY,  "Kabylake ULX GT2"},
+	{0x591f, 0x5912, INTEL_MODEL_KBY,  "Kabylake DT GT2"},
+	{0x5914, 0x5917, INTEL_MODEL_KBYM, "Kabylake Mobile GT2"},
+	{0x5910, 0x591b, INTEL_MODEL_KBYM, "Kabylake Halo GT2"},
+	{0x5918, 0x591d, INTEL_MODEL_KBY,  "Kabylake WKS GT2"},
+	{0x5904, 0x5926, INTEL_MODEL_KBY,  "Kabylake ULT GT3"},
+	{0x5904, 0x5927, INTEL_MODEL_KBY,  "Kabylake ULT GT3"},
+
 	{0x3e0f, 0x3e90, INTEL_MODEL_CFL,  "CoffeeLake GT1"},
 	{0x3e0f, 0x3e93, INTEL_MODEL_CFL,  "CoffeeLake GT1"},
 	{0x3e1f, 0x3e91, INTEL_MODEL_CFL,  "CoffeeLake GT2"},
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 03de63ef5c..7f9b06a439 100644
--- a/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp
+++ b/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp
@@ -134,6 +134,18 @@ const struct supported_device {
 	{0x192a, INTEL_MODEL_SKYS, "Skylake GT3"},
 	{0x192b, INTEL_MODEL_SKY,  "Skylake GT3"},
 
+	{0x5906, INTEL_MODEL_KBY,  "Kabylake ULT GT1"},
+	{0x5902, INTEL_MODEL_KBY,  "Kabylake DT GT1"},
+	{0x5916, INTEL_MODEL_KBY,  "Kabylake ULT GT2"},
+	{0x591c, INTEL_MODEL_KBY,  "Kabylake ULX GT2"},
+	{0x591e, INTEL_MODEL_KBY,  "Kabylake ULX GT2"},
+	{0x5912, INTEL_MODEL_KBY,  "Kabylake DT GT2"},
+	{0x5917, INTEL_MODEL_KBYM, "Kabylake Mobile GT2"},
+	{0x591b, INTEL_MODEL_KBYM, "Kabylake Halo GT2"},
+	{0x591d, INTEL_MODEL_KBY,  "Kabylake WKS GT2"},
+	{0x5926, INTEL_MODEL_KBY,  "Kabylake ULT GT3"},
+	{0x5927, INTEL_MODEL_KBY,  "Kabylake ULT GT3"},
+
 	{0x3e90, INTEL_MODEL_CFL,  "CoffeeLake GT1"},
 	{0x3e93, INTEL_MODEL_CFL,  "CoffeeLake GT1"},
 	{0x3e91, INTEL_MODEL_CFL,  "CoffeeLake GT2"},