monitor-edid:

  get VBE info only once even when probing multiple ports

2 files changed, 4 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index ac3af07..95e50ca 100644
--- a/NEWS
+++ b/NEWS
@@ -35,6 +35,7 @@
   o do not get duplicate EDIDs if the same EDID is available via
     multiple methods
   o allow retrieval of multiple EDIDs via VBE
+  o get VBE info only once even when probing multiple ports
 
 - monitor-edid:
   o add --first support for stopping processing after one EDID has been
diff --git a/monitor-edid b/monitor-edid
index b77f02b..54d41a4 100755
--- a/monitor-edid
+++ b/monitor-edid
@@ -88,13 +88,15 @@ sub get_edids {
 	if (my $cmd = get_using_vbe()) {
 	    my $min_port = $opt{'vbe-port'} || 0;
 	    my $max_port = $opt{'max-vbe-port'} || $opt{'vbe-port'} || 2;
+	    my $skip_vbe;
 	    foreach my $port ($min_port .. $max_port) {
 		warn "probing EDID using VBE (port $port)\n" if $opt{verbose};
-		my $edid = `$cmd --port $port`;
+		my $edid = `$cmd --port $port $skip_vbe`;
 		if ($? >> 8 == 2) {
 		    warn "VBE info call failed, skipping all ports\n" if $opt{verbose};
 		    last;
 		}
+		$skip_vbe = "--skip-vbe-check"; # VBE call ok, skip that for other ports
 		is_edid_possibly_valid($edid) or next;
 
 		next if grep { $_->[1] eq $edid } @l;