diff options
| author | Adam Jackson <ajax@redhat.com> | 2009-06-09 10:13:47 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2009-07-17 13:42:57 -0400 |
| commit | 2f1a9c5baa367818bf017bdb72f20a2f6fa7ac21 (patch) | |
| tree | cce9118c0c2f3dec54c058c269db28bc1e902199 | |
| parent | d0cb4f5a91932e901d10cac5f2a4ba12bb8a0e6f (diff) | |
ddc: s/xf86DDCMonitorSet/xf86EdidMonitorSet/
Since we need a second path for DisplayID.
| -rw-r--r-- | hw/xfree86/ddc/ddcProperty.c | 5 | ||||
| -rw-r--r-- | hw/xfree86/ddc/xf86DDC.h | 2 | ||||
| -rw-r--r-- | hw/xfree86/modes/xf86EdidModes.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c index 834f695bb..329a63964 100644 --- a/hw/xfree86/ddc/ddcProperty.c +++ b/hw/xfree86/ddc/ddcProperty.c @@ -114,7 +114,10 @@ xf86SetDDCproperties(ScrnInfoPtr pScrn, xf86MonPtr DDC) if (!pScrn || !pScrn->monitor || !DDC) return FALSE; - xf86DDCMonitorSet(pScrn->scrnIndex, pScrn->monitor, DDC); + if (DDC->flags & MONITOR_DISPLAYID) + ; + else + xf86EdidMonitorSet(pScrn->scrnIndex, pScrn->monitor, DDC); addRootWindowProperties(pScrn, DDC); diff --git a/hw/xfree86/ddc/xf86DDC.h b/hw/xfree86/ddc/xf86DDC.h index 07411b849..2deadce35 100644 --- a/hw/xfree86/ddc/xf86DDC.h +++ b/hw/xfree86/ddc/xf86DDC.h @@ -50,7 +50,7 @@ extern _X_EXPORT xf86MonPtr xf86InterpretEEDID( ); extern _X_EXPORT void -xf86DDCMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC); +xf86EdidMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC); extern _X_EXPORT Bool xf86SetDDCproperties( ScrnInfoPtr pScreen, diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c index e7cb16794..4bf178da8 100644 --- a/hw/xfree86/modes/xf86EdidModes.c +++ b/hw/xfree86/modes/xf86EdidModes.c @@ -943,7 +943,7 @@ xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC) * Fill out MonPtr with xf86MonPtr information. */ void -xf86DDCMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC) +xf86EdidMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC) { DisplayModePtr Modes = NULL, Mode; int i, clock; |