configure.ac | 2 +-
src/via_tmds.c | 16 ++++++++++++++--
src/via_ums.h | 56 ++++++++++++++++++++++++++++----------------------------
3 files changed, 43 insertions(+), 31 deletions(-)
New commits:
commit cce0f803ab717c4010e994b4b89b45fa46d32c72
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Jul 6 17:49:45 2017 -0500
Version bumped to 0.6.151
Finally, things are under control. Sorry for the inconvenience past
few versions caused.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/configure.ac b/configure.ac
index 6876bda..ace0b17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.6.150],
+ [0.6.151],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit 4bee3cf495fc6348441601f82f9152834a204c97
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Jul 6 17:44:48 2017 -0500
Moved DVI data transmission control into its DPMS callback
This is for integrated TMDS transmitter type DVI found in CX700 /
VX700 and VX800 chipsets.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_tmds.c b/src/via_tmds.c
index 66ae742..b8c5594 100644
--- a/src/via_tmds.c
+++ b/src/via_tmds.c
@@ -117,9 +117,6 @@ viaTMDSInitReg(ScrnInfoPtr pScrn)
viaFPSetPrimarySoftVDD(pScrn, FALSE);
viaFPSetPrimarySoftVEE(pScrn, FALSE);
- /* Turn on software controlled primary FP data transmission.*/
- viaFPSetPrimarySoftData(pScrn, TRUE);
-
/* Turn off software controlled primary FP back light
* control. */
viaFPSetPrimarySoftBackLight(pScrn, FALSE);
@@ -184,9 +181,17 @@ viaTMDSPower(ScrnInfoPtr pScrn, Bool powerState)
if (powerState) {
viaFPSetPrimaryDirectDisplayPeriod(pScrn, TRUE);
+
+ /* Turn on software controlled primary FP data transmission. */
+ viaFPSetPrimarySoftData(pScrn, TRUE);
+
viaTMDSSetPower(pScrn, TRUE);
} else {
viaTMDSSetPower(pScrn, FALSE);
+
+ /* Turn off software controlled primary FP data transmission. */
+ viaFPSetPrimarySoftData(pScrn, TRUE);
+
viaFPSetPrimaryDirectDisplayPeriod(pScrn, FALSE);
}
commit f0c3f413a9169005746e142c1573cf47269b5a0a
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Jul 6 17:41:30 2017 -0500
Inverting software controlled FP control bits
Unfortunately, they were inverted, but it was not discovered until now.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_tmds.c b/src/via_tmds.c
index 219fda0..66ae742 100644
--- a/src/via_tmds.c
+++ b/src/via_tmds.c
@@ -113,11 +113,18 @@ viaTMDSInitReg(ScrnInfoPtr pScrn)
/* Use software FP power sequence control. */
viaFPSetPrimaryPowerSeqType(pScrn, FALSE);
- /* Turn off software controlled primary FP (LVDS1) power rails. */
+ /* Turn off software controlled primary FP power rails. */
viaFPSetPrimarySoftVDD(pScrn, FALSE);
- viaFPSetPrimarySoftData(pScrn, FALSE);
viaFPSetPrimarySoftVEE(pScrn, FALSE);
+
+ /* Turn on software controlled primary FP data transmission.*/
+ viaFPSetPrimarySoftData(pScrn, TRUE);
+
+ /* Turn off software controlled primary FP back light
+ * control. */
viaFPSetPrimarySoftBackLight(pScrn, FALSE);
+
+ /* Turn off direct control of FP back light. */
viaFPSetPrimaryDirectBackLightCtrl(pScrn, FALSE);
/* Activate DVI + LVDS2 mode. */
diff --git a/src/via_ums.h b/src/via_ums.h
index e4986a3..b73d40e 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -603,10 +603,10 @@ static inline void
viaFPSetPrimarySoftBackLight(ScrnInfoPtr pScrn, Bool softOn)
{
/* 3X5.91[1] - FP Primary Software Back Light On
- * 0: On
- * 1: Off */
- ViaCrtcMask(VGAHWPTR(pScrn), 0x91, softOn ? 0x00 : BIT(1),
- BIT(1));
+ * 0: Off
+ * 1: On */
+ ViaCrtcMask(VGAHWPTR(pScrn), 0x91,
+ softOn ? BIT(1) : 0x00, BIT(1));
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"FP Primary Software Controlled Back Light: "
"%s\n",
@@ -621,10 +621,10 @@ static inline void
viaFPSetPrimarySoftVEE(ScrnInfoPtr pScrn, Bool softOn)
{
/* 3X5.91[2] - FP Primary Software VEE On
- * 0: On
- * 1: Off */
- ViaCrtcMask(VGAHWPTR(pScrn), 0x91, softOn ? 0x00 : BIT(2),
- BIT(2));
+ * 0: Off
+ * 1: On */
+ ViaCrtcMask(VGAHWPTR(pScrn), 0x91,
+ softOn ? BIT(2) : 0x00, BIT(2));
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"FP Primary Software Controlled VEE: "
"%s\n",
@@ -639,10 +639,10 @@ static inline void
viaFPSetPrimarySoftData(ScrnInfoPtr pScrn, Bool softOn)
{
/* 3X5.91[3] - FP Primary Software Data On
- * 0: On
- * 1: Off */
- ViaCrtcMask(VGAHWPTR(pScrn), 0x91, softOn ? 0x00 : BIT(3),
- BIT(3));
+ * 0: Off
+ * 1: On */
+ ViaCrtcMask(VGAHWPTR(pScrn), 0x91,
+ softOn ? BIT(3) : 0x00, BIT(3));
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"FP Primary Software Controlled Data: "
"%s\n",
@@ -657,10 +657,10 @@ static inline void
viaFPSetPrimarySoftVDD(ScrnInfoPtr pScrn, Bool softOn)
{
/* 3X5.91[4] - FP Primary Software VDD On
- * 0: On
- * 1: Off */
- ViaCrtcMask(VGAHWPTR(pScrn), 0x91, softOn ? 0x00 : BIT(4),
- BIT(4));
+ * 0: Off
+ * 1: On */
+ ViaCrtcMask(VGAHWPTR(pScrn), 0x91,
+ softOn ? BIT(4) : 0x00, BIT(4));
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"FP Primary Software Controlled VDD: "
"%s\n",
@@ -747,10 +747,10 @@ static inline void
viaFPSetSecondarySoftBackLight(ScrnInfoPtr pScrn, Bool softOn)
{
/* 3X5.D3[1] - FP Secondary Software Back Light On
- * 0: On
- * 1: Off */
+ * 0: Off
+ * 1: On */
ViaCrtcMask(VGAHWPTR(pScrn), 0xD3,
- softOn ? 0x00 : BIT(1), BIT(1));
+ softOn ? BIT(1) : 0x00, BIT(1));
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"FP Secondary Software Controlled "
"Back Light: %s\n", softOn ? "On" : "Off"));
@@ -764,10 +764,10 @@ static inline void
viaFPSetSecondarySoftVEE(ScrnInfoPtr pScrn, Bool softOn)
{
/* 3X5.D3[2] - FP Secondary Software VEE On
- * 0: On
- * 1: Off */
+ * 0: Off
+ * 1: On */
ViaCrtcMask(VGAHWPTR(pScrn), 0xD3,
- softOn ? 0x00 : BIT(2), BIT(2));
+ softOn ? BIT(2) : 0x00, BIT(2));
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"FP Secondary Software Controlled VEE: %s\n",
softOn ? "On" : "Off"));
@@ -781,10 +781,10 @@ static inline void
viaFPSetSecondarySoftData(ScrnInfoPtr pScrn, Bool softOn)
{
/* 3X5.D3[3] - FP Secondary Software Data On
- * 0: On
- * 1: Off */
+ * 0: Off
+ * 1: On */
ViaCrtcMask(VGAHWPTR(pScrn), 0xD3,
- softOn ? 0x00 : BIT(3), BIT(3));
+ softOn ? BIT(3) : 0x00, BIT(3));
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"FP Secondary Software Controlled Data: %s\n",
softOn ? "On" : "Off"));
@@ -798,10 +798,10 @@ static inline void
viaFPSetSecondarySoftVDD(ScrnInfoPtr pScrn, Bool softOn)
{
/* 3X5.D3[4] - FP Secondary Software VDD On
- * 0: On
- * 1: Off */
+ * 0: Off
+ * 1: On */
ViaCrtcMask(VGAHWPTR(pScrn), 0xD3,
- softOn ? 0x00 : BIT(4), BIT(4));
+ softOn ? BIT(4) : 0x00, BIT(4));
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"FP Secondary Software Controlled VDD: %s\n",
softOn ? "On" : "Off"));
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
