From 5094899e6bad547957861343fedd2501ac1539a8 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Mon, 25 Jan 2021 21:36:00 +0000
Subject: Don't try to run monitor-get-edid-using-vbe when booted in UEFI
 mode...

it may overwrite a memory region being used by the UEFI BIOS (mga#28124)
---
 monitor-edid | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'monitor-edid')

diff --git a/monitor-edid b/monitor-edid
index 3daca53..951a419 100755
--- a/monitor-edid
+++ b/monitor-edid
@@ -83,7 +83,11 @@ sub get_edids {
 	my $s = slurp($_); 
 	(is_edid_possibly_valid($s) && !$seen{ $_[1] }++) ? [ $_ => $s ] : ();
     } get_edid_files();
-    
+
+    # Don't try to run monitor-get-edid-using-vbe when booted in UEFI mode.
+    # It may overwrite a memory region being used by the UEFI BIOS (mga#28124)
+    return @l if -e '/sys/firmware/efi';
+
     if (!@l || !$b_get_first && $< == 0) {
 	if (my $cmd = get_using_vbe()) {
 	    my $min_port = $opt{'vbe-port'} || 0;
-- 
cgit v1.2.1