[Openchrome-devel] xf86-video-openchrome: 4 commits - configure.ac src/via_fp.c
Kevin Brace
kevinbrace at kemper.freedesktop.org
Fri Jun 9 15:36:32 UTC 2017
configure.ac | 2 -
src/via_fp.c | 110 ++++++++++++++++++++---------------------------------------
2 files changed, 39 insertions(+), 73 deletions(-)
New commits:
commit 22a8aaf6cef2137fa1c355497ff736a44dac134d
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Jun 9 08:35:35 2017 -0700
Version bumped to 0.6.132
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/configure.ac b/configure.ac
index 0710a36..9612262 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.6.131],
+ [0.6.132],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit 66ca2d500dc9124c4593239696312ab56a707966
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Jun 9 08:33:52 2017 -0700
Made changes to via_fp_prepare and via_fp_commit
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_fp.c b/src/via_fp.c
index 3a4c05d..0b94edc 100644
--- a/src/via_fp.c
+++ b/src/via_fp.c
@@ -1067,16 +1067,34 @@ static void
via_fp_prepare(xf86OutputPtr output)
{
ScrnInfoPtr pScrn = output->scrn;
+ VIAPtr pVia = VIAPTR(pScrn);
+ VIAFPPtr pVIAFP = (VIAFPPtr) output->driver_private;
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Entered via_fp_prepare.\n"));
+
+ viaFPPower(pScrn, pVia->Chipset, pVIAFP->diPort, FALSE);
+ viaFPIOPadState(pScrn, pVIAFP->diPort, FALSE);
- via_fp_dpms(output, DPMSModeOff);
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Exiting via_fp_prepare.\n"));
}
static void
via_fp_commit(xf86OutputPtr output)
{
ScrnInfoPtr pScrn = output->scrn;
+ VIAPtr pVia = VIAPTR(pScrn);
+ VIAFPPtr pVIAFP = (VIAFPPtr) output->driver_private;
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Entered via_fp_commit.\n"));
+
+ viaFPPower(pScrn, pVia->Chipset, pVIAFP->diPort, TRUE);
+ viaFPIOPadState(pScrn, pVIAFP->diPort, TRUE);
- via_fp_dpms(output, DPMSModeOn);
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Exiting via_fp_commit.\n"));
}
static void
commit 00e17d05dde9ce2d9a39bc003f78b613d1e4cf23
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Jun 9 08:14:34 2017 -0700
Rewrote viaFPPower
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_fp.c b/src/via_fp.c
index 8391308..3a4c05d 100644
--- a/src/via_fp.c
+++ b/src/via_fp.c
@@ -710,14 +710,12 @@ ViaLVDSHardwarePowerSecondSequence(ScrnInfoPtr pScrn, Bool on)
}
static void
-viaFPPower(ScrnInfoPtr pScrn, Bool powerState, CARD8 diPortType)
+viaFPPower(ScrnInfoPtr pScrn, int Chipset, CARD8 diPortType, Bool powerState)
{
- VIAPtr pVia = VIAPTR(pScrn);
-
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered viaFPPower.\n"));
- switch (pVia->Chipset) {
+ switch (Chipset) {
case VIA_CLE266:
viaFPCastleRockSoftPowerSeq(pScrn, powerState);
break;
@@ -730,29 +728,23 @@ viaFPPower(ScrnInfoPtr pScrn, Bool powerState, CARD8 diPortType)
case VIA_P4M900:
viaFPPrimaryHardPowerSeq(pScrn, powerState);
break;
- /*
- * VX800, CX700 have HW issue, so we'd better use SW power sequence.
- * Fix Ticket #308.
- */
case VIA_CX700:
case VIA_VX800:
- if ((diPortType & VIA_DI_PORT_LVDS1)
- && (diPortType & VIA_DI_PORT_LVDS2)) {
+ /*
+ * VX800, CX700 have HW issue, so we'd better use SW power sequence.
+ * Fix Ticket #308.
+ */
+ if (diPortType & VIA_DI_PORT_LVDS1) {
ViaLVDSSoftwarePowerFirstSequence(pScrn, powerState);
viaLVDS1SetPower(pScrn, powerState);
- ViaLVDSSoftwarePowerSecondSequence(pScrn, powerState);
- viaLVDS2SetPower(pScrn, powerState);
- } else if ((diPortType & VIA_DI_PORT_LVDS1)
- && (~(diPortType & VIA_DI_PORT_LVDS2))) {
- ViaLVDSSoftwarePowerFirstSequence(pScrn, powerState);
- viaLVDS1SetPower(pScrn, powerState);
- } else if ((~(diPortType & VIA_DI_PORT_LVDS1))
- && (diPortType & VIA_DI_PORT_LVDS2)) {
+ }
+
+ if (diPortType & VIA_DI_PORT_LVDS2) {
ViaLVDSSoftwarePowerSecondSequence(pScrn, powerState);
viaLVDS2SetPower(pScrn, powerState);
}
- break;
+ break;
case VIA_VX855:
case VIA_VX900:
ViaLVDSHardwarePowerFirstSequence(pScrn, powerState);
@@ -1007,57 +999,13 @@ via_fp_dpms(xf86OutputPtr output, int mode)
switch (mode) {
case DPMSModeOn:
- switch (pVia->Chipset) {
- case VIA_CLE266:
- case VIA_KM400:
- case VIA_P4M800PRO:
- case VIA_PM800:
- case VIA_K8M800:
- case VIA_P4M890:
- case VIA_K8M890:
- case VIA_P4M900:
- viaFPPower(pScrn, TRUE, VIA_DI_PORT_NONE);
- break;
- case VIA_CX700:
- case VIA_VX800:
- viaFPPower(pScrn, TRUE, VIA_DI_PORT_LVDS2);
- break;
- case VIA_VX855:
- case VIA_VX900:
- viaFPPower(pScrn, TRUE, VIA_DI_PORT_LVDS1);
- break;
- default:
- break;
- }
-
+ viaFPPower(pScrn, pVia->Chipset, pVIAFP->diPort, TRUE);
viaFPIOPadState(pScrn, pVIAFP->diPort, TRUE);
break;
case DPMSModeStandby:
case DPMSModeSuspend:
case DPMSModeOff:
- switch (pVia->Chipset) {
- case VIA_CLE266:
- case VIA_KM400:
- case VIA_P4M800PRO:
- case VIA_PM800:
- case VIA_K8M800:
- case VIA_P4M890:
- case VIA_K8M890:
- case VIA_P4M900:
- viaFPPower(pScrn, FALSE, VIA_DI_PORT_NONE);
- break;
- case VIA_CX700:
- case VIA_VX800:
- viaFPPower(pScrn, FALSE, VIA_DI_PORT_LVDS2);
- break;
- case VIA_VX855:
- case VIA_VX900:
- viaFPPower(pScrn, FALSE, VIA_DI_PORT_LVDS1);
- break;
- default:
- break;
- }
-
+ viaFPPower(pScrn, pVia->Chipset, pVIAFP->diPort, FALSE);
viaFPIOPadState(pScrn, pVIAFP->diPort, FALSE);
break;
default:
commit 35845ce77c9b5064b24a263584e048268a95f1ab
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Jun 9 05:39:20 2017 -0700
Changed viaFPIOPadSetting to viaFPIOPadState
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_fp.c b/src/via_fp.c
index 400b866..8391308 100644
--- a/src/via_fp.c
+++ b/src/via_fp.c
@@ -402,10 +402,10 @@ viaLVDS2SetOutputFormat(ScrnInfoPtr pScrn, CARD8 outputFormat)
}
static void
-viaFPIOPadSetting(ScrnInfoPtr pScrn, CARD8 diPort, Bool ioPadOn)
+viaFPIOPadState(ScrnInfoPtr pScrn, CARD8 diPort, Bool ioPadOn)
{
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered viaFPIOPadSetting.\n"));
+ "Entered viaFPIOPadState.\n"));
switch(diPort) {
case VIA_DI_PORT_DVP0:
@@ -445,7 +445,7 @@ viaFPIOPadSetting(ScrnInfoPtr pScrn, CARD8 diPort, Bool ioPadOn)
ioPadOn ? "On": "Off");
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting viaFPIOPadSetting.\n"));
+ "Exiting viaFPIOPadState.\n"));
}
static void
@@ -1030,7 +1030,7 @@ via_fp_dpms(xf86OutputPtr output, int mode)
break;
}
- viaFPIOPadSetting(pScrn, pVIAFP->diPort, TRUE);
+ viaFPIOPadState(pScrn, pVIAFP->diPort, TRUE);
break;
case DPMSModeStandby:
case DPMSModeSuspend:
@@ -1058,7 +1058,7 @@ via_fp_dpms(xf86OutputPtr output, int mode)
break;
}
- viaFPIOPadSetting(pScrn, pVIAFP->diPort, FALSE);
+ viaFPIOPadState(pScrn, pVIAFP->diPort, FALSE);
break;
default:
break;
More information about the Openchrome-devel
mailing list