diff --git a/headers/private/graphics/intel_extreme/intel_extreme.h b/headers/private/graphics/intel_extreme/intel_extreme.h
index 47c56d9ac1..f46968b167 100644
--- a/headers/private/graphics/intel_extreme/intel_extreme.h
+++ b/headers/private/graphics/intel_extreme/intel_extreme.h
@@ -85,6 +85,7 @@
 #define INTEL_MODEL_SKYM	(INTEL_GROUP_SKY | INTEL_TYPE_MOBILE)
 #define INTEL_MODEL_SKYS	(INTEL_GROUP_SKY | INTEL_TYPE_SERVER)
 #define INTEL_MODEL_CFL		(INTEL_GROUP_CFL)
+#define INTEL_MODEL_CFLM	(INTEL_GROUP_CFL | INTEL_TYPE_MOBILE)
 #define INTEL_MODEL_CML		(INTEL_GROUP_CML)
 
 #define INTEL_PCH_DEVICE_ID_MASK	0xff80
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 72c11983fc..8dfaf1d95b 100644
--- a/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
+++ b/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
@@ -142,6 +142,18 @@ const struct supported_device {
 	{0x1904, 0x1926, INTEL_MODEL_SKYM, "Skylake GT3"},
 	{0x1904, 0x192a, INTEL_MODEL_SKYS, "Skylake GT3"},
 	{0x1904, 0x192b, INTEL_MODEL_SKY,  "Skylake GT3"},
+
+	{0x3e0f, 0x3e90, INTEL_MODEL_CFL,  "CoffeeLake GT1"},
+	{0x3e0f, 0x3e93, INTEL_MODEL_CFL,  "CoffeeLake GT1"},
+	{0x3e1f, 0x3e91, INTEL_MODEL_CFL,  "CoffeeLake GT2"},
+	{0x3ec2, 0x3e92, INTEL_MODEL_CFL,  "CoffeeLake GT2"},
+	{0x3e18, 0x3e96, INTEL_MODEL_CFL,  "CoffeeLake GT2"},
+	{0x3e30, 0x3e98, INTEL_MODEL_CFL,  "CoffeeLake GT2"},
+	{0x3e31, 0x3e9a, INTEL_MODEL_CFL,  "CoffeeLake GT2"},
+	{0x3e10, 0x3eab, INTEL_MODEL_CFLM, "CoffeeLake Halo GT2"},
+	{0x3ec4, 0x3eab, INTEL_MODEL_CFLM, "CoffeeLake Halo GT2"},
+	{0x3ed0, 0x3ea5, INTEL_MODEL_CFL,  "CoffeeLake GT3"},
+	{0x3ed0, 0x3ea6, INTEL_MODEL_CFL,  "CoffeeLake GT3"},
 };
 
 struct intel_info {
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 3b326a284a..03de63ef5c 100644
--- a/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp
+++ b/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp
@@ -133,6 +133,17 @@ const struct supported_device {
 	{0x1926, INTEL_MODEL_SKYM, "Skylake GT3"},
 	{0x192a, INTEL_MODEL_SKYS, "Skylake GT3"},
 	{0x192b, INTEL_MODEL_SKY,  "Skylake GT3"},
+
+	{0x3e90, INTEL_MODEL_CFL,  "CoffeeLake GT1"},
+	{0x3e93, INTEL_MODEL_CFL,  "CoffeeLake GT1"},
+	{0x3e91, INTEL_MODEL_CFL,  "CoffeeLake GT2"},
+	{0x3e92, INTEL_MODEL_CFL,  "CoffeeLake GT2"},
+	{0x3e96, INTEL_MODEL_CFL,  "CoffeeLake GT2"},
+	{0x3e98, INTEL_MODEL_CFL,  "CoffeeLake GT2"},
+	{0x3e9a, INTEL_MODEL_CFL,  "CoffeeLake GT2"},
+	{0x3eab, INTEL_MODEL_CFLM, "CoffeeLake Halo GT2"},
+	{0x3ea5, INTEL_MODEL_CFL,  "CoffeeLake GT3"},
+	{0x3ea6, INTEL_MODEL_CFL,  "CoffeeLake GT3"},
 };
 
 int32 api_version = B_CUR_DRIVER_API_VERSION;
@@ -156,7 +167,7 @@ get_next_intel_extreme(int32* _cookie, pci_info &info, uint32 &type)
 		// check vendor
 		if (info.vendor_id != VENDOR_ID_INTEL
 			|| info.class_base != PCI_display
-			|| info.class_sub != PCI_vga)
+			|| (info.class_sub != PCI_vga && info.class_sub != PCI_display_other))
 			continue;
 
 		// check device