diff options
| author | Adam Jackson <ajax@redhat.com> | 2016-01-06 08:35:43 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-04-18 11:22:58 -0400 |
| commit | 8be83fff04a009109a956837ca983a96fd279711 (patch) | |
| tree | b6ba65d7bb3eb4e701081370548b5a810313b63c | |
| parent | 0cd2a24b61ef1583fc6b3fec7d01c7481cc97d52 (diff) | |
xfree86: Remove some leftovers from DisplayID support
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | hw/xfree86/ddc/ddcProperty.c | 10 | ||||
| -rw-r--r-- | 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 fc63f0e8a..c51c3e6d6 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 4c2da51c1..750e4270b 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 |