diff options
author | marha <marha@users.sourceforge.net> | 2014-10-12 21:11:32 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-10-12 21:38:35 +0200 |
commit | 1a83b8e49a75e2dab63805de25e384e0e38c27ed (patch) | |
tree | 5280fe2a1bd2ce227e4bce9ce06134986e181de1 /xorg-server/hw/xfree86/ddc/ddc.c | |
parent | 4aea4b223604c589828beb1145875a5fbcc41eed (diff) | |
parent | 9480392b8817f8bfa79cbc694ff039a73fc0a57f (diff) | |
download | vcxsrv-1a83b8e49a75e2dab63805de25e384e0e38c27ed.tar.gz vcxsrv-1a83b8e49a75e2dab63805de25e384e0e38c27ed.tar.bz2 vcxsrv-1a83b8e49a75e2dab63805de25e384e0e38c27ed.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/glsl_symbol_table.h
mesalib/src/mesa/drivers/common/meta_blit.c
xorg-server/dix/dispatch.c
xorg-server/glx/indirect_dispatch.c
xorg-server/glx/indirect_dispatch_swap.c
xorg-server/mi/miexpose.c
Diffstat (limited to 'xorg-server/hw/xfree86/ddc/ddc.c')
-rw-r--r-- | xorg-server/hw/xfree86/ddc/ddc.c | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/xorg-server/hw/xfree86/ddc/ddc.c b/xorg-server/hw/xfree86/ddc/ddc.c index 04d1a09c5..15e4beb54 100644 --- a/xorg-server/hw/xfree86/ddc/ddc.c +++ b/xorg-server/hw/xfree86/ddc/ddc.c @@ -468,61 +468,3 @@ xf86DoEDID_DDC2(ScrnInfoPtr pScrn, I2CBusPtr pBus) { return xf86DoEEDID(pScrn, pBus, FALSE); } - -/* XXX write me */ -static void * -DDC2ReadDisplayID(void) -{ - return FALSE; -} - -/** - * Attempts to probe the monitor for DisplayID information, if NoDDC and - * NoDDC2 are unset. DisplayID blocks are interpreted and the results - * returned in an xf86MonPtr. - * - * This function does not affect the list of modes used by drivers -- it is up - * to the driver to decide policy on what to do with DisplayID information. - * - * @return pointer to a new xf86MonPtr containing the DisplayID information. - * @return NULL if no monitor attached or failure to interpret the DisplayID. - */ -xf86MonPtr -xf86DoDisplayID(ScrnInfoPtr pScrn, I2CBusPtr pBus) -{ - unsigned char *did = NULL; - xf86MonPtr tmp = NULL; - I2CDevPtr dev = NULL; - - /* Default DDC and DDC2 to enabled. */ - Bool noddc = FALSE, noddc2 = FALSE; - OptionInfoPtr options; - - options = malloc(sizeof(DDCOptions)); - if (!options) - return NULL; - memcpy(options, DDCOptions, sizeof(DDCOptions)); - xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options); - - xf86GetOptValBool(options, DDCOPT_NODDC, &noddc); - xf86GetOptValBool(options, DDCOPT_NODDC2, &noddc2); - free(options); - - if (noddc || noddc2) - return NULL; - - if (!(dev = DDC2Init(pBus))) - return NULL; - - if ((did = DDC2ReadDisplayID())) { - tmp = calloc(1, sizeof(*tmp)); - if (!tmp) - return NULL; - - tmp->scrnIndex = pScrn->scrnIndex; - tmp->flags |= MONITOR_DISPLAYID; - tmp->rawData = did; - } - - return tmp; -} |