Added failsafe versions of CML framebuffers

acidanthera · May 28, 2020 · 3ec7dca · 3ec7dca
1 parent 5bd095b
commit 3ec7dca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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;