configure.ac | 2 - src/via_analog.c | 1 src/via_vt1632.c | 61 +++++++++++++++++++++++++++++++------------------------ src/via_vt1632.h | 1 4 files changed, 36 insertions(+), 29 deletions(-)
New commits: commit 2d12631c0c587ef430c1c49a32ba67305c38b7d0 Author: Kevin Brace <kevinbr...@gmx.com> Date: Sat Aug 6 21:55:33 2016 -0700 Version bumped to 0.5.119 Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/configure.ac b/configure.ac index 1140394..bddca5b 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ(2.57) AC_INIT([xf86-video-openchrome], - [0.5.118], + [0.5.119], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome], [xf86-video-openchrome]) commit f7e393c88e8f11aefdd36e88899530cdb42f7607 Author: Kevin Brace <kevinbr...@gmx.com> Date: Sat Aug 6 21:53:23 2016 -0700 Code cleanup of via_vt1632_detect Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/src/via_vt1632.c b/src/via_vt1632.c index 4157ccb..1274fc0 100644 --- a/src/via_vt1632.c +++ b/src/via_vt1632.c @@ -319,19 +319,18 @@ via_dvi_commit(xf86OutputPtr output) static xf86OutputStatus via_vt1632_detect(xf86OutputPtr output) { + xf86MonPtr mon; xf86OutputStatus status = XF86OutputStatusDisconnected; ScrnInfoPtr pScrn = output->scrn; - VIAPtr pVia = VIAPTR(pScrn); - ViaVT1632Ptr Private = output->driver_private; - xf86MonPtr mon; + ViaVT1632Ptr pVIAVT1632Rec = output->driver_private; - /* Check for the DVI presence via VT1632A first before accessing + /* Check for the DVI presence via VT1632 first before accessing * I2C bus. */ - if (viaVT1632Sense(pScrn, Private->VT1632I2CDev)) { + if (viaVT1632Sense(pScrn, pVIAVT1632Rec->VT1632I2CDev)) { /* Since DVI presence was established, access the I2C bus * assigned to DVI. */ - mon = xf86OutputGetEDID(output, Private->VT1632I2CDev->pI2CBus); + mon = xf86OutputGetEDID(output, pVIAVT1632Rec->VT1632I2CDev->pI2CBus); /* Is the interface type digital? */ if (mon && DIGITAL(mon->features.input_type)) { commit 376cb93ef52f0f204f56917530c174f560ef5665 Author: Kevin Brace <kevinbr...@gmx.com> Date: Sat Aug 6 21:39:17 2016 -0700 Rewrite of viaVT1632Sense Now the return type is a Bool. Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/src/via_vt1632.c b/src/via_vt1632.c index b465f57..4157ccb 100644 --- a/src/via_vt1632.c +++ b/src/via_vt1632.c @@ -209,31 +209,31 @@ via_vt1632_mode_set(xf86OutputPtr output, DisplayModePtr mode, "Exiting via_vt1632_mode_set.\n")); } -static xf86OutputStatus -viaVT1632Sense(xf86OutputPtr output) +/* + * Returns TMDS receiver detection state for VIA Technologies VT1632 + * external TMDS transmitter. + */ +static Bool +viaVT1632Sense(ScrnInfoPtr pScrn, I2CDevPtr pDev) { - ViaVT1632Ptr Private = output->driver_private; - xf86OutputStatus status; - ScrnInfoPtr pScrn = output->scrn; CARD8 tmp; + Bool receiverDetected = FALSE; DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Entered viaVT1632Sense.\n")); - xf86I2CReadByte(Private->VT1632I2CDev, 0x09, &tmp); + xf86I2CReadByte(pDev, 0x09, &tmp); if (tmp & 0x04) { - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "VT1632A: DVI device is detected.\n"); - status = XF86OutputStatusConnected; - } else { - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "VT1632A: DVI device was not detected.\n"); - status = XF86OutputStatusDisconnected; + receiverDetected = TRUE; } + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "VT1632 %s a TMDS receiver.\n", + receiverDetected ? "detected" : "did not detect"); + DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Exiting viaVT1632Sense.\n")); - return status; + return receiverDetected; } static void @@ -327,8 +327,7 @@ via_vt1632_detect(xf86OutputPtr output) /* Check for the DVI presence via VT1632A first before accessing * I2C bus. */ - status = viaVT1632Sense(output); - if (status == XF86OutputStatusConnected) { + if (viaVT1632Sense(pScrn, Private->VT1632I2CDev)) { /* Since DVI presence was established, access the I2C bus * assigned to DVI. */ @@ -336,9 +335,14 @@ via_vt1632_detect(xf86OutputPtr output) /* Is the interface type digital? */ if (mon && DIGITAL(mon->features.input_type)) { + status = XF86OutputStatusConnected; + xf86DrvMsg(pScrn->scrnIndex, X_PROBED, + "Detected a monitor connected to DVI.\n"); xf86OutputSetEDID(output, mon); } else { - status = XF86OutputStatusDisconnected; + xf86DrvMsg(pScrn->scrnIndex, X_PROBED, + "Could not obtain EDID from a monitor " + "connected to DVI.\n"); } } commit 4da8d57883da7a7b29a1e1338ceb1e455f60af54 Author: Kevin Brace <kevinbr...@gmx.com> Date: Sat Aug 6 11:17:18 2016 -0700 Changing via_dvi_detect to via_vt1632_detect Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/src/via_vt1632.c b/src/via_vt1632.c index ed602d5..b465f57 100644 --- a/src/via_vt1632.c +++ b/src/via_vt1632.c @@ -317,7 +317,7 @@ via_dvi_commit(xf86OutputPtr output) } static xf86OutputStatus -via_dvi_detect(xf86OutputPtr output) +via_vt1632_detect(xf86OutputPtr output) { xf86OutputStatus status = XF86OutputStatusDisconnected; ScrnInfoPtr pScrn = output->scrn; @@ -366,7 +366,7 @@ const xf86OutputFuncsRec via_dvi_funcs = { .prepare = via_dvi_prepare, .commit = via_dvi_commit, .mode_set = via_vt1632_mode_set, - .detect = via_dvi_detect, + .detect = via_vt1632_detect, .get_modes = xf86OutputGetEDIDModes, .destroy = via_dvi_destroy, }; commit 5f4e75aa3a75547ee2403383cf5710da2e3fd428 Author: Kevin Brace <kevinbr...@gmx.com> Date: Sat Aug 6 10:55:47 2016 -0700 Changing via_vt1632_detect to viaVT1632Sense This function is located inside via_vt1632.c. Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/src/via_vt1632.c b/src/via_vt1632.c index 8e617dd..ed602d5 100644 --- a/src/via_vt1632.c +++ b/src/via_vt1632.c @@ -209,8 +209,8 @@ via_vt1632_mode_set(xf86OutputPtr output, DisplayModePtr mode, "Exiting via_vt1632_mode_set.\n")); } -xf86OutputStatus -via_vt1632_detect(xf86OutputPtr output) +static xf86OutputStatus +viaVT1632Sense(xf86OutputPtr output) { ViaVT1632Ptr Private = output->driver_private; xf86OutputStatus status; @@ -218,7 +218,7 @@ via_vt1632_detect(xf86OutputPtr output) CARD8 tmp; DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Entered via_vt1632_detect.\n")); + "Entered viaVT1632Sense.\n")); xf86I2CReadByte(Private->VT1632I2CDev, 0x09, &tmp); if (tmp & 0x04) { @@ -232,7 +232,7 @@ via_vt1632_detect(xf86OutputPtr output) } DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Exiting via_vt1632_detect.\n")); + "Exiting viaVT1632Sense.\n")); return status; } @@ -327,7 +327,7 @@ via_dvi_detect(xf86OutputPtr output) /* Check for the DVI presence via VT1632A first before accessing * I2C bus. */ - status = via_vt1632_detect(output); + status = viaVT1632Sense(output); if (status == XF86OutputStatusConnected) { /* Since DVI presence was established, access the I2C bus diff --git a/src/via_vt1632.h b/src/via_vt1632.h index 5efd4f9..3b208a0 100644 --- a/src/via_vt1632.h +++ b/src/via_vt1632.h @@ -49,7 +49,6 @@ void via_vt1632_power(xf86OutputPtr output, Bool powerState); void via_vt1632_save(xf86OutputPtr output); void via_vt1632_restore(xf86OutputPtr output); int via_vt1632_mode_valid(xf86OutputPtr output, DisplayModePtr pMode); -xf86OutputStatus via_vt1632_detect(xf86OutputPtr output); Bool viaVT1632Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus); #endif /* _VIA_VT1632_H_ */ commit 3ef546266fe6f65acd9376af2f5dcd98cd19cd84 Author: Xavier Bachelot <xav...@bachelot.org> Date: Sat Aug 6 10:46:30 2016 -0700 Fix unused-variable warning in via_analog.c Xavier Bachelot <xav...@bachelot.org> diff --git a/src/via_analog.c b/src/via_analog.c index 15d21a2..1ce1d98 100644 --- a/src/via_analog.c +++ b/src/via_analog.c @@ -255,7 +255,6 @@ via_analog_mode_set(xf86OutputPtr output, DisplayModePtr mode, DisplayModePtr adjusted_mode) { ScrnInfoPtr pScrn = output->scrn; - vgaHWPtr hwp = VGAHWPTR(pScrn); drmmode_crtc_private_ptr iga = output->crtc->driver_private; DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, commit 291294ec54d8866e20475228e278da46cd1bd57f Author: Kevin Brace <kevinbr...@gmx.com> Date: Sat Aug 6 10:37:51 2016 -0700 Added debug messages to via_vt1632_dpms This function is located inside via_vt1632.c. Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/src/via_vt1632.c b/src/via_vt1632.c index ba10de2..8e617dd 100644 --- a/src/via_vt1632.c +++ b/src/via_vt1632.c @@ -261,6 +261,9 @@ via_vt1632_dpms(xf86OutputPtr output, int mode) { ScrnInfoPtr pScrn = output->scrn; + DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Entered via_vt1632_dpms.\n")); + switch (mode) { case DPMSModeOn: via_vt1632_power(output, TRUE); @@ -273,6 +276,9 @@ via_vt1632_dpms(xf86OutputPtr output, int mode) default: break; } + + DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Exiting via_vt1632_dpms.\n")); } static void _______________________________________________ Openchrome-devel mailing list Openchrome-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/openchrome-devel