configure.ac | 2 -
src/via_fp.c | 48 ++++++++++++++++-------------------
src/via_i2c.c | 8 ++---
src/via_tmds.c | 1
src/via_ums.h | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
5 files changed, 102 insertions(+), 35 deletions(-)
New commits:
commit ec71b1e6184ee866b560c7dbfc0f0d9d0813fd65
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Jun 29 20:52:31 2017 -0500
Version bumped to 0.6.143
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/configure.ac b/configure.ac
index b6d7c43..98947d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.6.142],
+ [0.6.143],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit 4d7f6f8583a87a6ada777555823d1060bbb1146f
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Jun 29 20:51:01 2017 -0500
Made updates to viaFPPrimarySoftPowerSeq
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_fp.c b/src/via_fp.c
index 93b5dc7..a86241d 100644
--- a/src/via_fp.c
+++ b/src/via_fp.c
@@ -330,14 +330,14 @@ viaFPCastleRockSoftPowerSeq(ScrnInfoPtr pScrn, Bool
powerState)
static void
viaFPPrimarySoftPowerSeq(ScrnInfoPtr pScrn, Bool powerState)
{
- vgaHWPtr hwp = VGAHWPTR(pScrn);
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Entered viaFPPrimarySoftPowerSeq.\n"));
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "viaFPPrimarySoftPowerSeq:
%d\n", powerState));
- if (powerState) {
+ /* Use software FP power sequence control. */
+ viaFPSetPrimaryPowerSeqType(pScrn, FALSE);
- /* Software control power sequence ON*/
- hwp->writeCrtc(hwp, 0x91, hwp->readCrtc(hwp, 0x91) & 0x7F);
- hwp->writeCrtc(hwp, 0x91, hwp->readCrtc(hwp, 0x91) | 0x01);
+ if (powerState) {
+ viaFPSetPrimaryDirectDisplayPeriodCtrl(pScrn, TRUE);
usleep(TD0);
viaFPSetPrimarySoftVDD(pScrn, TRUE);
@@ -363,7 +363,11 @@ viaFPPrimarySoftPowerSeq(ScrnInfoPtr pScrn, Bool
powerState)
usleep(TD1);
viaFPSetPrimarySoftVDD(pScrn, FALSE);
+ viaFPSetPrimaryDirectDisplayPeriodCtrl(pScrn, FALSE);
}
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Exiting viaFPPrimarySoftPowerSeq.\n"));
}
static void
commit c9605f2453874280ed75672cadd15e051db45054
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Jun 29 20:41:13 2017 -0500
Added viaFPSetPrimarySoftVDD
This is an inline function.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_fp.c b/src/via_fp.c
index 86c3561..93b5dc7 100644
--- a/src/via_fp.c
+++ b/src/via_fp.c
@@ -340,8 +340,7 @@ viaFPPrimarySoftPowerSeq(ScrnInfoPtr pScrn, Bool powerState)
hwp->writeCrtc(hwp, 0x91, hwp->readCrtc(hwp, 0x91) | 0x01);
usleep(TD0);
- /* VDD ON*/
- hwp->writeCrtc(hwp, 0x91, hwp->readCrtc(hwp, 0x91) | 0x10);
+ viaFPSetPrimarySoftVDD(pScrn, TRUE);
usleep(TD1);
viaFPSetPrimarySoftData(pScrn, TRUE);
@@ -363,8 +362,7 @@ viaFPPrimarySoftPowerSeq(ScrnInfoPtr pScrn, Bool powerState)
viaFPSetPrimarySoftData(pScrn, FALSE);
usleep(TD1);
- /* VDD OFF */
- hwp->writeCrtc(hwp, 0x91, hwp->readCrtc(hwp, 0x91) & 0xEF);
+ viaFPSetPrimarySoftVDD(pScrn, FALSE);
}
}
diff --git a/src/via_ums.h b/src/via_ums.h
index 4238295..791836f 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -644,6 +644,24 @@ viaFPSetPrimarySoftData(ScrnInfoPtr pScrn, Bool softOn)
}
/*
+ * Sets KM400 or later chipset's FP primary software controlled
+ * VDD.
+ */
+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));
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "FP Primary Software Controlled VDD: "
+ "%s\n",
+ softOn ? "On" : "Off"));
+}
+
+/*
* Sets KM400 or later chipset's FP primary direct back light control
* bit.
*/
commit e8450acc1bf99e9e58c0de86902a7a6bbe6f2dde
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Jun 29 20:33:09 2017 -0500
Added viaFPSetPrimarySoftData
This is an inline function.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_fp.c b/src/via_fp.c
index fada881..86c3561 100644
--- a/src/via_fp.c
+++ b/src/via_fp.c
@@ -344,8 +344,7 @@ viaFPPrimarySoftPowerSeq(ScrnInfoPtr pScrn, Bool powerState)
hwp->writeCrtc(hwp, 0x91, hwp->readCrtc(hwp, 0x91) | 0x10);
usleep(TD1);
- /* DATA ON */
- hwp->writeCrtc(hwp, 0x91, hwp->readCrtc(hwp, 0x91) | 0x08);
+ viaFPSetPrimarySoftData(pScrn, TRUE);
usleep(TD2);
/* VEE On (unused on vt3353) */
@@ -361,8 +360,7 @@ viaFPPrimarySoftPowerSeq(ScrnInfoPtr pScrn, Bool powerState)
viaFPSetPrimarySoftVEE(pScrn, FALSE);
usleep(TD2);
- /* DATA OFF */
- hwp->writeCrtc(hwp, 0x91, hwp->readCrtc(hwp, 0x91) & 0xF7);
+ viaFPSetPrimarySoftData(pScrn, FALSE);
usleep(TD1);
/* VDD OFF */
diff --git a/src/via_ums.h b/src/via_ums.h
index 73a99e7..4238295 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -626,6 +626,24 @@ viaFPSetPrimarySoftVEE(ScrnInfoPtr pScrn, Bool softOn)
}
/*
+ * Sets KM400 or later chipset's FP primary software controlled
+ * data.
+ */
+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));
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "FP Primary Software Controlled Data: "
+ "%s\n",
+ softOn ? "On" : "Off"));
+}
+
+/*
* Sets KM400 or later chipset's FP primary direct back light control
* bit.
*/
commit d499f6fadb4d1ae1fbc38774adf2633e00f96ab3
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Jun 29 19:33:41 2017 -0500
Added viaFPSetPrimarySoftVEE
This is an inline function.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_fp.c b/src/via_fp.c
index ee1817a..fada881 100644
--- a/src/via_fp.c
+++ b/src/via_fp.c
@@ -348,8 +348,8 @@ viaFPPrimarySoftPowerSeq(ScrnInfoPtr pScrn, Bool powerState)
hwp->writeCrtc(hwp, 0x91, hwp->readCrtc(hwp, 0x91) | 0x08);
usleep(TD2);
- /* VEE ON (unused on vt3353)*/
- hwp->writeCrtc(hwp, 0x91, hwp->readCrtc(hwp, 0x91) | 0x04);
+ /* VEE On (unused on vt3353) */
+ viaFPSetPrimarySoftVEE(pScrn, TRUE);
usleep(TD3);
viaFPSetPrimarySoftBackLight(pScrn, TRUE);
@@ -357,8 +357,8 @@ viaFPPrimarySoftPowerSeq(ScrnInfoPtr pScrn, Bool powerState)
viaFPSetPrimarySoftBackLight(pScrn, FALSE);
usleep(TD3);
- /* VEE OFF (unused on vt3353)*/
- hwp->writeCrtc(hwp, 0x91, hwp->readCrtc(hwp, 0x91) & 0xFB);
+ /* VEE Off (unused on vt3353) */
+ viaFPSetPrimarySoftVEE(pScrn, FALSE);
usleep(TD2);
/* DATA OFF */
diff --git a/src/via_ums.h b/src/via_ums.h
index 679ab57..73a99e7 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -608,6 +608,24 @@ viaFPSetPrimarySoftBackLight(ScrnInfoPtr pScrn, Bool
softOn)
}
/*
+ * Sets KM400 or later chipset's FP primary software controlled
+ * VEE.
+ */
+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));
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "FP Primary Software Controlled VEE: "
+ "%s\n",
+ softOn ? "On" : "Off"));
+}
+
+/*
* Sets KM400 or later chipset's FP primary direct back light control
* bit.
*/
commit a5a4eeb6365ff504a477892fe8bcd95debc24424
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Jun 29 19:29:16 2017 -0500
Added viaFPSetPrimarySoftBackLight
This is an inline function.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_fp.c b/src/via_fp.c
index e92ec4c..ee1817a 100644
--- a/src/via_fp.c
+++ b/src/via_fp.c
@@ -352,11 +352,9 @@ viaFPPrimarySoftPowerSeq(ScrnInfoPtr pScrn, Bool
powerState)
hwp->writeCrtc(hwp, 0x91, hwp->readCrtc(hwp, 0x91) | 0x04);
usleep(TD3);
- /* Back-Light ON */
- hwp->writeCrtc(hwp, 0x91, hwp->readCrtc(hwp, 0x91) | 0x02);
+ viaFPSetPrimarySoftBackLight(pScrn, TRUE);
} else {
- /* Back-Light OFF */
- hwp->writeCrtc(hwp, 0x91, hwp->readCrtc(hwp, 0x91) & 0xFD);
+ viaFPSetPrimarySoftBackLight(pScrn, FALSE);
usleep(TD3);
/* VEE OFF (unused on vt3353)*/
diff --git a/src/via_ums.h b/src/via_ums.h
index 368c652..679ab57 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -590,6 +590,24 @@ viaFPSetPrimaryPowerSeqType(ScrnInfoPtr pScrn, Bool
ctrlType)
}
/*
+ * Sets KM400 or later chipset's FP primary software controlled
+ * back light.
+ */
+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));
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "FP Primary Software Controlled Back Light: "
+ "%s\n",
+ softOn ? "On" : "Off"));
+}
+
+/*
* Sets KM400 or later chipset's FP primary direct back light control
* bit.
*/
commit fc7aa1577499c56cc75a3dcef48bfb6e795569da
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Jun 29 18:55:24 2017 -0500
Renamed ViaLVDSSoftwarePowerFirstSequence to viaFPPrimarySoftPowerSeq
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_fp.c b/src/via_fp.c
index a13bcd9..e92ec4c 100644
--- a/src/via_fp.c
+++ b/src/via_fp.c
@@ -328,12 +328,12 @@ viaFPCastleRockSoftPowerSeq(ScrnInfoPtr pScrn, Bool
powerState)
}
static void
-ViaLVDSSoftwarePowerFirstSequence(ScrnInfoPtr pScrn, Bool on)
+viaFPPrimarySoftPowerSeq(ScrnInfoPtr pScrn, Bool powerState)
{
vgaHWPtr hwp = VGAHWPTR(pScrn);
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"ViaLVDSSoftwarePowerFirstSequence: %d\n", on));
- if (on) {
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "viaFPPrimarySoftPowerSeq:
%d\n", powerState));
+ if (powerState) {
/* Software control power sequence ON*/
hwp->writeCrtc(hwp, 0x91, hwp->readCrtc(hwp, 0x91) & 0x7F);
@@ -507,7 +507,7 @@ viaFPPower(ScrnInfoPtr pScrn, int Chipset, CARD8
diPortType, Bool powerState)
* Fix Ticket #308.
*/
if (diPortType & VIA_DI_PORT_LVDS1) {
- ViaLVDSSoftwarePowerFirstSequence(pScrn, powerState);
+ viaFPPrimarySoftPowerSeq(pScrn, powerState);
viaLVDS1SetPower(pScrn, powerState);
}
commit 68a863b1f9c31933844638370d38847b82c0896b
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Jun 29 18:24:02 2017 -0500
A change to viaFPDPHighSetDisplaySource debug message
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_ums.h b/src/via_ums.h
index db19e27..368c652 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -756,9 +756,9 @@ viaFPDPHighSetDisplaySource(ScrnInfoPtr pScrn, CARD8
displaySource)
* 0: Primary Display
* 1: Secondary Display */
ViaCrtcMask(VGAHWPTR(pScrn), 0x97, displaySource << 4, BIT(4));
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "FPDP High Display Source: IGA%d\n",
- (displaySource & 0x01) + 1);
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "FPDP High Display Source: IGA%d\n",
+ (displaySource & 0x01) + 1));
}
/*
commit 50058110ae4f93a07cee3799c936b96f5f36d3cd
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Tue Jun 27 14:21:31 2017 -0500
Minor reorganizing inside ViaI2CBus3Init
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_i2c.c b/src/via_i2c.c
index d0710b2..6b5b952 100644
--- a/src/via_i2c.c
+++ b/src/via_i2c.c
@@ -391,13 +391,13 @@ ViaI2C3SimpleGetBits(I2CBusPtr Bus, int *clock, int *data)
static I2CBusPtr
ViaI2CBus3Init(ScrnInfoPtr pScrn)
{
+ vgaHWPtr hwp = VGAHWPTR(pScrn);
+ I2CBusPtr pI2CBus;
+
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered ViaI2CBus3Init.\n"));
- I2CBusPtr pI2CBus = xf86CreateI2CBusRec();
- vgaHWPtr hwp = VGAHWPTR(pScrn);
- VIAPtr pVia = VIAPTR(pScrn);
-
+ pI2CBus = xf86CreateI2CBusRec();
if (!pI2CBus) {
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"xf86CreateI2CBusRec failed.\n"));
commit 7a902623251cee5b387fdfe12271d5411043c4c8
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Tue Jun 27 14:16:18 2017 -0500
Removed an unused variable from via_fp_get_modes
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_fp.c b/src/via_fp.c
index 4daa6f7..a13bcd9 100644
--- a/src/via_fp.c
+++ b/src/via_fp.c
@@ -1006,8 +1006,6 @@ via_fp_get_modes(xf86OutputPtr output)
* using CVT.
*/
if (pVIAFP->NativeWidth && pVIAFP->NativeHeight) {
- VIAPtr pVia = VIAPTR(pScrn);
-
if (pVIADisplay->isOLPCXO15) {
pDisplay_Mode = xf86DuplicateMode(&OLPCMode);
} else {
commit 4a59a3b86471debd6fe4ff973d80438c309df932
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Tue Jun 27 14:11:40 2017 -0500
Removed an unused label from via_tmds_detect
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_tmds.c b/src/via_tmds.c
index d7aacec..8908f3f 100644
--- a/src/via_tmds.c
+++ b/src/via_tmds.c
@@ -898,7 +898,6 @@ via_tmds_detect(xf86OutputPtr output)
}
}
-exit:
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Exiting via_tmds_detect.\n"));
return status;
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
