[PATCH xserver v2 5/9] xfree86: Remove some leftovers from DisplayID support

[Adam Jackson]

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 hw/xfree86/ddc/ddcProperty.c | 10 ++--------
 hw/xfree86/ddc/edid.h        |  1 -
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c
index fc63f0e..c51c3e6 100644
--- a/hw/xfree86/ddc/ddcProperty.c
+++ b/hw/xfree86/ddc/ddcProperty.c
@@ -53,11 +53,7 @@ addRootWindowProperties(ScrnInfoPtr pScrn, xf86MonPtr DDC)
 {
     int scrnIndex = pScrn->scrnIndex;
 
-    if (DDC->flags & MONITOR_DISPLAYID) {
-        /* Don't bother, use RANDR already */
-        return;
-    }
-    else if (DDC->ver.version == 1) {
+    if (DDC->ver.version == 1) {
         int size = 128 +
             (DDC->flags & EDID_COMPLETE_RAWDATA ? DDC->no_sections * 128 : 0);
 
@@ -76,9 +72,7 @@ xf86SetDDCproperties(ScrnInfoPtr pScrn, xf86MonPtr DDC)
     if (!pScrn || !pScrn->monitor || !DDC)
         return FALSE;
 
-    if (DDC->flags & MONITOR_DISPLAYID);
-    else
-        xf86EdidMonitorSet(pScrn->scrnIndex, pScrn->monitor, DDC);
+    xf86EdidMonitorSet(pScrn->scrnIndex, pScrn->monitor, DDC);
 
     addRootWindowProperties(pScrn, DDC);
 
diff --git a/hw/xfree86/ddc/edid.h b/hw/xfree86/ddc/edid.h
index 4c2da51..750e427 100644
--- a/hw/xfree86/ddc/edid.h
+++ b/hw/xfree86/ddc/edid.h
@@ -537,7 +537,6 @@ struct detailed_monitor_section {
 #define MONITOR_EDID_COMPLETE_RAWDATA	0x01
 /* old, don't use */
 #define EDID_COMPLETE_RAWDATA		0x01
-#define MONITOR_DISPLAYID		0x02
 
 /*
  * For DisplayID devices, only the scrnIndex, flags, and rawData fields
-- 
2.5.0