aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mandriva.org>2009-08-15 19:14:19 +0000
committerAnssi Hannula <anssi@mandriva.org>2009-08-15 19:14:19 +0000
commit8644ab905a6a0800852d2f4dc3f5b39185c397c3 (patch)
tree599ec554f749fc4caa41f8b9f7608beaa60d2531
parentf1c336f8b5d5cd0a8c6b8eb14416f68fed965dc3 (diff)
downloadmonitor-edid-8644ab905a6a0800852d2f4dc3f5b39185c397c3.tar
monitor-edid-8644ab905a6a0800852d2f4dc3f5b39185c397c3.tar.gz
monitor-edid-8644ab905a6a0800852d2f4dc3f5b39185c397c3.tar.bz2
monitor-edid-8644ab905a6a0800852d2f4dc3f5b39185c397c3.tar.xz
monitor-edid-8644ab905a6a0800852d2f4dc3f5b39185c397c3.zip
monitor-edid: support getting EDID from kernel DRM when kernel mode-setting is
enabled
-rw-r--r--NEWS4
-rwxr-xr-xmonitor-edid6
2 files changed, 9 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 75f5513..00f41e3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+- monitor-edid, monitor-get-edid:
+ o support getting EDID from kernel DRM when kernel mode-setting is
+ enabled (Anssi Hannula)
+
Version 2.1 - 7 July 2008
- monitor-parse-edid:
diff --git a/monitor-edid b/monitor-edid
index 89f7516..283320a 100755
--- a/monitor-edid
+++ b/monitor-edid
@@ -111,7 +111,11 @@ sub get_edid_files() {
my ($state) = slurp($state_f) =~ /state:\s*0x(\w+)/;
hex($state) & 2; # bit 1 is "Output is activated"
} find_EDID($opt{'acpi-dir'});
- (@l1, @l2);
+ my @l3 = grep {
+ (my $state_f = $_) =~ s/edid$/enabled/;
+ slurp($state_f) =~ /enabled/;
+ } glob("/sys/class/drm/card*-*/edid");
+ (@l1, @l2, @l3);
}
sub find_EDID {