From: anonymix007 <48598263+anonymix007@users.noreply.github.com>
Date: Mon, 24 Mar 2025 13:53:49 +0000 (+0300)
Subject: chid: Setup EDID CHIDs
X-Git-Tag: v258-rc1~668^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eec1f041b159ea11233ac22f9b4832a82af4ece2;p=thirdparty%2Fsystemd.git

chid: Setup EDID CHIDs
---

diff --git a/src/boot/chid.c b/src/boot/chid.c
index 69e68e7d019..24739e956cc 100644
--- a/src/boot/chid.c
+++ b/src/boot/chid.c
@@ -16,6 +16,7 @@
 
 #include "chid.h"
 #include "chid-fundamental.h"
+#include "edid.h"
 #include "efi.h"
 #include "sha1-fundamental.h"
 #include "smbios.h"
@@ -72,6 +73,8 @@ static void smbios_info_populate(SmbiosInfo *ret_info) {
         ret_info->smbios_fields[CHID_SMBIOS_FAMILY] = smbios_to_hashable_string(raw.family);
         ret_info->smbios_fields[CHID_SMBIOS_BASEBOARD_PRODUCT] = smbios_to_hashable_string(raw.baseboard_product);
         ret_info->smbios_fields[CHID_SMBIOS_BASEBOARD_MANUFACTURER] = smbios_to_hashable_string(raw.baseboard_manufacturer);
+
+        edid_get_discovered_panel_id(&ret_info->smbios_fields[CHID_EDID_PANEL]);
 }
 
 static void smbios_info_done(SmbiosInfo *info) {
@@ -100,7 +103,7 @@ EFI_STATUS chid_match(const void *hwid_buffer, size_t hwid_length, uint32_t matc
         const Device *devices = ASSERT_PTR(hwid_buffer);
 
         EFI_GUID chids[CHID_TYPES_MAX] = {};
-        static const size_t priority[] = { 3, 6, 8, 10, 4, 5, 7, 9, 11 }; /* From most to least specific. */
+        static const size_t priority[] = { 17, 16, 15, 3, 6, 8, 10, 4, 5, 7, 9, 11 }; /* From most to least specific. */
 
         status = populate_board_chids(chids);
         if (EFI_STATUS_IS_ERROR(status))