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

ddc: s/xf86DDCMonitorSet/xf86EdidMonitorSet/ 

Since we need a second path for DisplayID.
This commit is contained in:
Adam Jackson 2009-06-09 10:13:47 -04:00
parent d0cb4f5a91
commit 2f1a9c5baa
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,7 +114,10 @@ xf86SetDDCproperties(ScrnInfoPtr pScrn, xf86MonPtr DDC)
if (!pScrn || !pScrn->monitor || !DDC) if (!pScrn || !pScrn->monitor || !DDC)
return FALSE; return FALSE;
xf86DDCMonitorSet(pScrn->scrnIndex, pScrn->monitor, DDC); if (DDC->flags & MONITOR_DISPLAYID)
;
else
xf86EdidMonitorSet(pScrn->scrnIndex, pScrn->monitor, DDC);
addRootWindowProperties(pScrn, DDC); addRootWindowProperties(pScrn, DDC);

2
hw/xfree86/ddc/xf86DDC.h
View File

@ -50,7 +50,7 @@ extern _X_EXPORT xf86MonPtr xf86InterpretEEDID(
); );
extern _X_EXPORT void extern _X_EXPORT void
xf86DDCMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC); xf86EdidMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC);
extern _X_EXPORT Bool xf86SetDDCproperties( extern _X_EXPORT Bool xf86SetDDCproperties(
ScrnInfoPtr pScreen, ScrnInfoPtr pScreen,

2
hw/xfree86/modes/xf86EdidModes.c
View File

@ -943,7 +943,7 @@ xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC)
* Fill out MonPtr with xf86MonPtr information. * Fill out MonPtr with xf86MonPtr information.
*/ */
void void
xf86DDCMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC) xf86EdidMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC)
{ {
DisplayModePtr Modes = NULL, Mode; DisplayModePtr Modes = NULL, Mode;
int i, clock; int i, clock;