From 3ec7dca352038b309a79f54226314fcd02fe7417 Mon Sep 17 00:00:00 2001
From: vit9696 <vit9696@users.noreply.github.com>
Date: Thu, 28 May 2020 22:31:16 +0300
Subject: [PATCH] Added failsafe versions of CML framebuffers

---
 Changelog.md                  | 1 +
 Lilu/Sources/kern_devinfo.cpp | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 8dceda16..99deeef5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,7 @@ Lilu Changelog
 ==============
 #### v1.4.5
 - Fixed newer CPU generation detection
+- Added failsafe versions of CML framebuffers
 
 #### v1.4.4
 - Added new CFL connector-less framebuffers: 0x9BC80003, 0x9BC50003, 0x9BC40003
diff --git a/Lilu/Sources/kern_devinfo.cpp b/Lilu/Sources/kern_devinfo.cpp
index 05594ea0..8454f9d2 100644
--- a/Lilu/Sources/kern_devinfo.cpp
+++ b/Lilu/Sources/kern_devinfo.cpp
@@ -60,6 +60,8 @@ void DeviceInfo::updateFramebufferId() {
 					reportedFramebufferId = ConnectorLessKabyLakePlatformId2;
 				else if (gen == CPUInfo::CpuGeneration::CoffeeLake)
 					reportedFramebufferId = ConnectorLessCoffeeLakePlatformId2;
+				else if (gen == CPUInfo::CpuGeneration::CometLake)
+					reportedFramebufferId = ConnectorLessCoffeeLakePlatformId4;
 				else
 					reportedFramebufferId = DefaultVesaPlatformId;
 			} else {
@@ -78,7 +80,7 @@ void DeviceInfo::updateFramebufferId() {
 						reportedFramebufferId = 0x19160000;
 					else if (gen == CPUInfo::CpuGeneration::KabyLake)
 						reportedFramebufferId = 0x591B0000;
-					else if (gen == CPUInfo::CpuGeneration::CoffeeLake)
+					else if (gen == CPUInfo::CpuGeneration::CoffeeLake || gen == CPUInfo::CpuGeneration::CometLake)
 						reportedFramebufferId = 0x3EA50009;
 					else if (gen == CPUInfo::CpuGeneration::CannonLake)
 						reportedFramebufferId = 0x5A590000;
@@ -99,7 +101,7 @@ void DeviceInfo::updateFramebufferId() {
 						reportedFramebufferId = DefaultAppleSkylakePlatformId;
 					else if (gen == CPUInfo::CpuGeneration::KabyLake)
 						reportedFramebufferId = DefaultAppleKabyLakePlatformId;
-					else if (gen == CPUInfo::CpuGeneration::CoffeeLake)
+					else if (gen == CPUInfo::CpuGeneration::CoffeeLake || gen == CPUInfo::CpuGeneration::CometLake)
 						reportedFramebufferId = 0x3E9B0007;
 					else if (gen == CPUInfo::CpuGeneration::CannonLake)
 						reportedFramebufferId = DefaultAppleCannonLakePlatformId;