frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: Remove some leftovers from DisplayID support 

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2016-01-06 08:35:43 -05:00
parent 0cd2a24b61
commit 8be83fff04
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xfree86/ddc/ddcProperty.c
View File

@ -53,11 +53,7 @@ addRootWindowProperties(ScrnInfoPtr pScrn, xf86MonPtr DDC)
{ {
int scrnIndex = pScrn->scrnIndex; int scrnIndex = pScrn->scrnIndex;
if (DDC->flags & MONITOR_DISPLAYID) { if (DDC->ver.version == 1) {
/* Don't bother, use RANDR already */
return;
}
else if (DDC->ver.version == 1) {
int size = 128 + int size = 128 +
(DDC->flags & EDID_COMPLETE_RAWDATA ? DDC->no_sections * 128 : 0); (DDC->flags & EDID_COMPLETE_RAWDATA ? DDC->no_sections * 128 : 0);
@ -76,8 +72,6 @@ xf86SetDDCproperties(ScrnInfoPtr pScrn, xf86MonPtr DDC)
if (!pScrn || !pScrn->monitor || !DDC) if (!pScrn || !pScrn->monitor || !DDC)
return FALSE; return FALSE;
if (DDC->flags & MONITOR_DISPLAYID);
else
xf86EdidMonitorSet(pScrn->scrnIndex, pScrn->monitor, DDC); xf86EdidMonitorSet(pScrn->scrnIndex, pScrn->monitor, DDC);
addRootWindowProperties(pScrn, DDC); addRootWindowProperties(pScrn, DDC);

1
hw/xfree86/ddc/edid.h
View File

@ -537,7 +537,6 @@ struct detailed_monitor_section {
#define MONITOR_EDID_COMPLETE_RAWDATA 0x01 #define MONITOR_EDID_COMPLETE_RAWDATA 0x01
/* old, don't use */ /* old, don't use */
#define EDID_COMPLETE_RAWDATA 0x01 #define EDID_COMPLETE_RAWDATA 0x01
#define MONITOR_DISPLAYID 0x02
/* /*
* For DisplayID devices, only the scrnIndex, flags, and rawData fields * For DisplayID devices, only the scrnIndex, flags, and rawData fields