configure.ac | 2 +-
src/via_tmds.c | 18 +++++++-----------
src/via_ums.h | 1 -
src/via_vt1632.c | 14 ++++++--------
4 files changed, 14 insertions(+), 21 deletions(-)
New commits:
commit 8e6ab899c6d5a9eef845bf1170d4c6df9ac4736e
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Sun Aug 7 14:59:51 2016 -0700
Version bumped to 0.5.121
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/configure.ac b/configure.ac
index 460d457..2b69764 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.5.120],
+ [0.5.121],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit eede2983930e5b9ba36a057cdd798b3a7056cdd7
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Sun Aug 7 14:58:16 2016 -0700
Rewrite of viaVT1632Power
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_vt1632.c b/src/via_vt1632.c
index 84a3c76..4a9aaf7 100644
--- a/src/via_vt1632.c
+++ b/src/via_vt1632.c
@@ -130,16 +130,13 @@ viaVT1632Sense(ScrnInfoPtr pScrn, I2CDevPtr pDev)
}
static void
-viaVT1632Power(xf86OutputPtr output, Bool powerState)
+viaVT1632Power(ScrnInfoPtr pScrn, I2CDevPtr pDev, Bool powerState)
{
- ViaVT1632Ptr Private = output->driver_private;
- ScrnInfoPtr pScrn = output->scrn;
-
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered viaVT1632Power.\n"));
- xf86I2CMaskByte(Private->VT1632I2CDev, 0x08, powerState ? 0x01 : 0x00,
0x01);
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VT1632A Power: %s\n",
+ xf86I2CMaskByte(pDev, 0x08, powerState ? 0x01 : 0x00, 0x01);
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VT1632 (DVI) Power: %s\n",
powerState ? "On" : "Off");
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
@@ -258,18 +255,19 @@ static void
via_vt1632_dpms(xf86OutputPtr output, int mode)
{
ScrnInfoPtr pScrn = output->scrn;
+ ViaVT1632Ptr pVIAVT1632Rec = output->driver_private;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered via_vt1632_dpms.\n"));
switch (mode) {
case DPMSModeOn:
- viaVT1632Power(output, TRUE);
+ viaVT1632Power(pScrn, pVIAVT1632Rec->VT1632I2CDev, TRUE);
break;
case DPMSModeStandby:
case DPMSModeSuspend:
case DPMSModeOff:
- viaVT1632Power(output, FALSE);
+ viaVT1632Power(pScrn, pVIAVT1632Rec->VT1632I2CDev, FALSE);
break;
default:
break;
commit ef6ffc57d9ad7e8ea0990d07949d3f1a0b866ead
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Sun Aug 7 14:29:52 2016 -0700
Rewrite of viaTMDSPower
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_tmds.c b/src/via_tmds.c
index 644e9ec..d44afd5 100644
--- a/src/via_tmds.c
+++ b/src/via_tmds.c
@@ -198,26 +198,22 @@ viaTMDSSense(ScrnInfoPtr pScrn)
return tmdsReceiverDetected;
}
-void
-viaTMDSPower(ScrnInfoPtr pScrn, Bool On)
+static void
+viaTMDSPower(ScrnInfoPtr pScrn, Bool powerState)
{
-
vgaHWPtr hwp = VGAHWPTR(pScrn);
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered viaTMDSPower.\n"));
- if (On) {
- /* Power on TMDS */
- ViaCrtcMask(hwp, 0xD2, 0x00, 0x08);
- } else {
- /* Power off TMDS */
- ViaCrtcMask(hwp, 0xD2, 0x08, 0x08);
- }
+ /* 3X5.D2[3] - Power Down (Active High) for DVI
+ * 0: TMDS power on
+ * 1: TMDS power down */
+ ViaCrtcMask(hwp, 0xD2, powerState ? 0x00 : 0x08, 0x08);
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Integrated TMDS (DVI) Power: %s\n",
- On ? "On" : "Off");
+ powerState ? "On" : "Off");
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Exiting viaTMDSPower.\n"));
diff --git a/src/via_ums.h b/src/via_ums.h
index 8b872f2..3cae835 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -240,7 +240,6 @@ void via_analog_init(ScrnInfoPtr pScrn);
void via_lvds_init(ScrnInfoPtr pScrn);
/* via_tmds.c */
-void viaTMDSPower(ScrnInfoPtr pScrn, Bool On);
void via_dvi_init(ScrnInfoPtr pScrn);
/*via_tv.c */
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
