From 87628f17eb7ce2cbb0173774e436db1695ebb744 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 11 Jun 2018 20:34:14 -0500 Subject: [PATCH] intel_extreme: Add additional more recent PCH devices Change-Id: Ib9f7dc187300c9f746bca9fd7f721c1954f5be44 --- .../private/graphics/intel_extreme/intel_extreme.h | 13 +++++++++++-- .../drivers/graphics/intel_extreme/driver.cpp | 13 +++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/headers/private/graphics/intel_extreme/intel_extreme.h b/headers/private/graphics/intel_extreme/intel_extreme.h index 1c79b57527..96422559a6 100644 --- a/headers/private/graphics/intel_extreme/intel_extreme.h +++ b/headers/private/graphics/intel_extreme/intel_extreme.h @@ -90,9 +90,15 @@ #define INTEL_PCH_CPT_DEVICE_ID 0x1c00 #define INTEL_PCH_PPT_DEVICE_ID 0x1e00 #define INTEL_PCH_LPT_DEVICE_ID 0x8c00 -#define INTEL_PCH_LPT_LP_DEVICE_ID 0x9c00 /* Wildcat Point */ +#define INTEL_PCH_LPT_LP_DEVICE_ID 0x9c00 +#define INTEL_PCH_WPT_DEVICE_ID 0x8c80 +#define INTEL_PCH_WPT_LP_DEVICE_ID 0x9c80 #define INTEL_PCH_SPT_DEVICE_ID 0xa100 #define INTEL_PCH_SPT_LP_DEVICE_ID 0x9d00 +#define INTEL_PCH_KBP_DEVICE_ID 0xa280 +#define INTEL_PCH_CNP_DEVICE_ID 0xa300 +#define INTEL_PCH_CNP_LP_DEVICE_ID 0x9d80 +#define INTEL_PCH_ICP_DEVICE_ID 0x3480 #define INTEL_PCH_P2X_DEVICE_ID 0x7100 #define INTEL_PCH_P3X_DEVICE_ID 0x7000 @@ -215,7 +221,10 @@ enum pch_info { INTEL_PCH_IBX, // Ibexpeak INTEL_PCH_CPT, // Cougarpoint INTEL_PCH_LPT, // Lynxpoint - INTEL_PCH_SPT, // Sunrisepoint + INTEL_PCH_SPT, // SunrisePoint + INTEL_PCH_KBP, // KabyLake + INTEL_PCH_CNP, // CannonLake + INTEL_PCH_ICP, // IceLake INTEL_PCH_NOP }; 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 766fb520f6..861b34b086 100644 --- a/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp +++ b/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp @@ -197,12 +197,25 @@ detect_intel_pch() return INTEL_PCH_CPT; case INTEL_PCH_LPT_DEVICE_ID: case INTEL_PCH_LPT_LP_DEVICE_ID: + case INTEL_PCH_WPT_DEVICE_ID: + case INTEL_PCH_WPT_LP_DEVICE_ID: + // WildcatPoint is LPT compatible ERROR("%s: Found LynxPoint PCH\n", __func__); return INTEL_PCH_LPT; case INTEL_PCH_SPT_DEVICE_ID: case INTEL_PCH_SPT_LP_DEVICE_ID: ERROR("%s: Found SunrisePoint PCH\n", __func__); return INTEL_PCH_SPT; + case INTEL_PCH_KBP_DEVICE_ID: + ERROR("%s: Found Kaby Lake PCH\n", __func__); + return INTEL_PCH_KBP; + case INTEL_PCH_CNP_DEVICE_ID: + case INTEL_PCH_CNP_LP_DEVICE_ID: + ERROR("%s: Found Cannon Lake PCH\n", __func__); + return INTEL_PCH_CNP; + case INTEL_PCH_ICP_DEVICE_ID: + ERROR("%s: Found Ice Lake PCH\n", __func__); + return INTEL_PCH_ICP; } }