diff options
author | Adam Jackson <ajax@redhat.com> | 2009-06-09 10:05:01 -0400 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2009-07-17 13:33:13 -0400 |
commit | 14103b781201bc36896cbe9112a2e0d991fb785d (patch) | |
tree | 71114e27d3e57471dbaf99dbb223954fad0413a0 /hw | |
parent | c302a5ff49146bff24df196fc36ed38745d42911 (diff) |
ddc: Don't try to publish a root window property for DisplayID
Diffstat (limited to 'hw')
-rw-r--r-- | hw/xfree86/ddc/ddcProperty.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c index a4384f1d3..66d734afe 100644 --- a/hw/xfree86/ddc/ddcProperty.c +++ b/hw/xfree86/ddc/ddcProperty.c @@ -45,7 +45,10 @@ addRootWindowProperties(ScrnInfoPtr pScrn, xf86MonPtr DDC) Bool makeEDID1prop = FALSE; Bool makeEDID2prop = FALSE; - if (DDC->ver.version == 1) { + if (DDC->flags & MONITOR_DISPLAYID) { + /* Don't bother, use RANDR already */ + return; + } else if (DDC->ver.version == 1) { makeEDID1prop = TRUE; } else if (DDC->ver.version == 2) { int checksum1; |