configure.ac | 2 +-
src/via_vt1632.c | 28 +++++++++++++++++++++++++++-
src/via_vt1632.h | 1 +
3 files changed, 29 insertions(+), 2 deletions(-)
New commits:
commit 6236417b183feab0e3c27e959661425f87509503
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Fri Aug 5 21:54:18 2016 -0700
Version bumped to 0.5.116
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/configure.ac b/configure.ac
index ede6ba9..cc4bb4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.5.115],
+ [0.5.116],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit 4dbed232b342a44d0ce3ff85832de003330b01c5
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Fri Aug 5 21:48:16 2016 -0700
Reversing most of commit 46f5f3e
Commit 46f5f3e was a bad commit, and it will lead to a crash if
VT1632(A) is being used.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_vt1632.c b/src/via_vt1632.c
index 45e57ca..f3b0c6e 100644
--- a/src/via_vt1632.c
+++ b/src/via_vt1632.c
@@ -200,6 +200,33 @@ via_vt1632_mode_set(xf86OutputPtr output, DisplayModePtr
mode,
"Exiting via_vt1632_mode_set.\n"));
}
+xf86OutputStatus
+via_vt1632_detect(xf86OutputPtr output)
+{
+ ViaVT1632Ptr Private = output->driver_private;
+ xf86OutputStatus status;
+ ScrnInfoPtr pScrn = output->scrn;
+ CARD8 tmp;
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Entered via_vt1632_detect.\n"));
+
+ xf86I2CReadByte(Private->VT1632I2CDev, 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;
+ }
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Exiting via_vt1632_detect.\n"));
+ return status;
+}
+
Bool
viaVT1632Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus)
{
diff --git a/src/via_vt1632.h b/src/via_vt1632.h
index 06df175..c424fac 100644
--- a/src/via_vt1632.h
+++ b/src/via_vt1632.h
@@ -47,6 +47,7 @@ void via_vt1632_save(xf86OutputPtr output);
void via_vt1632_restore(xf86OutputPtr output);
int via_vt1632_mode_valid(xf86OutputPtr output, DisplayModePtr pMode);
void via_vt1632_mode_set(xf86OutputPtr output, DisplayModePtr mode,
DisplayModePtr adjusted_mode);
+xf86OutputStatus via_vt1632_detect(xf86OutputPtr output);
Bool viaVT1632Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus);
#endif /* _VIA_VT1632_H_ */
commit 309386481e2dea3696f35bd814b857af500867e9
Author: Xavier Bachelot <xav...@bachelot.org>
Date: Fri Aug 5 21:32:30 2016 -0700
Fix unused-variable warnings in via_tmds.c
Signed-off-by: Xavier Bachelot <xav...@bachelot.org>
diff --git a/src/via_vt1632.c b/src/via_vt1632.c
index 7e669cf..45e57ca 100644
--- a/src/via_vt1632.c
+++ b/src/via_vt1632.c
@@ -204,7 +204,6 @@ Bool
viaVT1632Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus)
{
xf86OutputPtr output;
- VIAPtr pVia = VIAPTR(pScrn);
ViaVT1632Ptr pVIAVT1632Rec = NULL;
I2CDevPtr pI2CDevice = NULL;
I2CSlaveAddr i2cAddr = 0x10;
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
