configure.ac | 2 -
src/via_display.c | 6 ----
src/via_fp.c | 46 -----------------------------------
src/via_outputs.c | 56 -------------------------------------------
src/via_tmds.c | 6 ++--
src/via_tv.c | 8 +++---
src/via_ums.h | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++---
7 files changed, 75 insertions(+), 119 deletions(-)
New commits:
commit da8f8465da745dda70afacc03cc343121cc380f4
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Jun 8 18:45:07 2017 -0700
Version bumped to 0.6.130
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/configure.ac b/configure.ac
index 515c648..2fac114 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.6.129],
+ [0.6.130],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit 67d002162c86e2caef064e66b0d93c5f9bb08c4b
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Jun 8 18:43:33 2017 -0700
Changing viaDVP1EnableIOPads to viaDVP1SetIOPadState
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_tmds.c b/src/via_tmds.c
index 37f2416..a622859 100644
--- a/src/via_tmds.c
+++ b/src/via_tmds.c
@@ -481,7 +481,7 @@ viaExtTMDSEnableIOPads(ScrnInfoPtr pScrn, CARD8 ioPadState)
* 1: DVP1 is used as a capture port
*/
if (!(sr13 & 0x40)) {
- viaDVP1EnableIOPads(pScrn, ioPadState);
+ viaDVP1SetIOPadState(pScrn, ioPadState);
} else {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"DVP1 is not set up for TMDS "
diff --git a/src/via_tv.c b/src/via_tv.c
index 32cc718..23d1428 100644
--- a/src/via_tv.c
+++ b/src/via_tv.c
@@ -242,7 +242,7 @@ viaTVEnableIOPads(ScrnInfoPtr pScrn, CARD8 ioPadState)
} else if ((sr13 & 0x08) && (!(sr12 & 0x10))) {
viaDFPLowEnableIOPads(pScrn, ioPadState);
} else if (sr13 & 0x08) {
- viaDVP1EnableIOPads(pScrn, ioPadState);
+ viaDVP1SetIOPadState(pScrn, ioPadState);
} else {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"None of the external ports were set up for "
@@ -280,7 +280,7 @@ viaTVEnableIOPads(ScrnInfoPtr pScrn, CARD8 ioPadState)
* 1: DVP1 is used as a capture port
*/
if (!(sr13 & 0x40)) {
- viaDVP1EnableIOPads(pScrn, ioPadState);
+ viaDVP1SetIOPadState(pScrn, ioPadState);
} else {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"DVP1 is not set up for external TV "
diff --git a/src/via_ums.h b/src/via_ums.h
index 8124730..d3e6f7e 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -352,7 +352,7 @@ viaDVP1SetDisplaySource(ScrnInfoPtr pScrn, CARD8
displaySource)
* Sets DVP1 (Digital Video Port 1) I/O pad state.
*/
static inline void
-viaDVP1EnableIOPads(ScrnInfoPtr pScrn, CARD8 ioPadState)
+viaDVP1SetIOPadState(ScrnInfoPtr pScrn, CARD8 ioPadState)
{
/* 3C5.1E[5:4] - DVP1 Power Control
* 0x: Pad always off
commit 4a616fde38586562aad34e9a80d99f8ec23f80e0
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Jun 8 18:33:06 2017 -0700
Converting viaDVP1EnableIOPads to an inline function
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_outputs.c b/src/via_outputs.c
index ac195e9..2d2fb9e 100644
--- a/src/via_outputs.c
+++ b/src/via_outputs.c
@@ -198,34 +198,6 @@ viaDVP0SetDataDriveStrength(ScrnInfoPtr pScrn, CARD8
dataDriveStrength)
}
/*
- * Sets DVP1 (Digital Video Port 1) I/O pad state.
- */
-void
-viaDVP1EnableIOPads(ScrnInfoPtr pScrn, CARD8 ioPadState)
-{
- vgaHWPtr hwp = VGAHWPTR(pScrn);
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered viaDVP1EnableIOPads.\n"));
-
- /* Set DVP1 I/O pad state. */
- /* 3C5.1E[5:4] - DVP1 Power Control
- * 0x: Pad always off
- * 10: Depend on the other control signal
- * 11: Pad on/off according to the
- * Power Management Status (PMS) */
- ViaSeqMask(hwp, 0x1E, ioPadState << 4, 0x30);
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "DVP1 I/O Pad State: %s\n",
- (ioPadState & 0x02) ?
- (ioPadState & 0x01) ? "Automatic On / Off": "Conditional"
- : "Off");
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting viaDVP1EnableIOPads.\n"));
-}
-
-/*
* Sets DVP1 (Digital Video Port 1) clock I/O pad drive strength.
*/
void
diff --git a/src/via_ums.h b/src/via_ums.h
index ebf2dc9..8124730 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -349,6 +349,26 @@ viaDVP1SetDisplaySource(ScrnInfoPtr pScrn, CARD8
displaySource)
}
/*
+ * Sets DVP1 (Digital Video Port 1) I/O pad state.
+ */
+static inline void
+viaDVP1EnableIOPads(ScrnInfoPtr pScrn, CARD8 ioPadState)
+{
+ /* 3C5.1E[5:4] - DVP1 Power Control
+ * 0x: Pad always off
+ * 10: Depend on the other control signal
+ * 11: Pad on/off according to the
+ * Power Management Status (PMS) */
+ ViaSeqMask(VGAHWPTR(pScrn), 0x1E, ioPadState << 4, BIT(5) | BIT(4));
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "DVP1 I/O Pad State: %s\n",
+ ((ioPadState & (BIT(1) | BIT(0))) == 0x03) ? "On" :
+ ((ioPadState & (BIT(1) | BIT(0))) == 0x02) ?
"Conditional" :
+ ((ioPadState & (BIT(1) | BIT(0))) == 0x01) ? "Off" :
+ "Off"));
+}
+
+/*
* Sets analog (VGA) DPMS State.
*/
static inline void
@@ -704,7 +724,6 @@ void viaDVP0SetClockDriveStrength(ScrnInfoPtr pScrn,
CARD8 clockDriveStrength);
void viaDVP0SetDataDriveStrength(ScrnInfoPtr pScrn,
CARD8 dataDriveStrength);
-void viaDVP1EnableIOPads(ScrnInfoPtr pScrn, CARD8 ioPadState);
void viaDVP1SetClockDriveStrength(ScrnInfoPtr pScrn,
CARD8 clockDriveStrength);
void viaDVP1SetDataDriveStrength(ScrnInfoPtr pScrn,
commit 363d5c12a37032a93b8fbde8149121a047ab28f1
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Jun 8 18:26:41 2017 -0700
Changing viaDVP0EnableIOPads to viaDVP0SetIOPadState
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_tmds.c b/src/via_tmds.c
index 15f49cb..37f2416 100644
--- a/src/via_tmds.c
+++ b/src/via_tmds.c
@@ -442,7 +442,7 @@ viaExtTMDSEnableIOPads(ScrnInfoPtr pScrn, CARD8 ioPadState)
* 0: Dual 12-bit FPDP (Flat Panel Display Port)
* 1: 24-bit FPDP (Flat Panel Display Port) */
if ((sr12 & 0x40) && (!(sr12 & 0x20))) {
- viaDVP0EnableIOPads(pScrn, ioPadState);
+ viaDVP0SetIOPadState(pScrn, ioPadState);
} else if ((sr13 & 0x08) && (!(sr12 & 0x10))) {
viaDFPLowEnableIOPads(pScrn, ioPadState);
} else {
@@ -462,7 +462,7 @@ viaExtTMDSEnableIOPads(ScrnInfoPtr pScrn, CARD8 ioPadState)
* 0: DVP0 is used by a TMDS transmitter (DVI)
* 1: DVP0 is used by a TV encoder */
if ((sr12 & 0x40) && (!(sr12 & 0x20))) {
- viaDVP0EnableIOPads(pScrn, ioPadState);
+ viaDVP0SetIOPadState(pScrn, ioPadState);
} else if (!(sr12 & 0x10)) {
viaDFPLowEnableIOPads(pScrn, ioPadState);
} else {
diff --git a/src/via_tv.c b/src/via_tv.c
index c051821..32cc718 100644
--- a/src/via_tv.c
+++ b/src/via_tv.c
@@ -238,7 +238,7 @@ viaTVEnableIOPads(ScrnInfoPtr pScrn, CARD8 ioPadState)
* 0: Dual 12-bit FPDP (Flat Panel Display Port)
* 1: 24-bit FPDP (Flat Panel Display Port) */
if ((sr12 & 0x40) && (sr12 & 0x20)) {
- viaDVP0EnableIOPads(pScrn, ioPadState);
+ viaDVP0SetIOPadState(pScrn, ioPadState);
} else if ((sr13 & 0x08) && (!(sr12 & 0x10))) {
viaDFPLowEnableIOPads(pScrn, ioPadState);
} else if (sr13 & 0x08) {
@@ -263,7 +263,7 @@ viaTVEnableIOPads(ScrnInfoPtr pScrn, CARD8 ioPadState)
* 0: Dual 12-bit FPDP (Flat Panel Display Port)
* 1: 24-bit FPDP (Flat Panel Display Port) */
if ((sr12 & 0x40) && (sr12 & 0x20) && (!(sr12 & 0x10))) {
- viaDVP0EnableIOPads(pScrn, ioPadState);
+ viaDVP0SetIOPadState(pScrn, ioPadState);
} else {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Unrecognized external TV encoder use.\n"
diff --git a/src/via_ums.h b/src/via_ums.h
index 7ba546b..ebf2dc9 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -317,7 +317,7 @@ viaDVP0SetDisplaySource(ScrnInfoPtr pScrn, CARD8
displaySource)
* Sets DVP0 (Digital Video Port 0) I/O pad state.
*/
static inline void
-viaDVP0EnableIOPads(ScrnInfoPtr pScrn, CARD8 ioPadState)
+viaDVP0SetIOPadState(ScrnInfoPtr pScrn, CARD8 ioPadState)
{
/* 3C5.1E[7:6] - DVP0 Power Control
* 0x: Pad always off
commit 164770f354577a8704d4499545c709e5ef476a02
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Jun 8 18:20:27 2017 -0700
Converting viaDVP0EnableIOPads to an inline function
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_outputs.c b/src/via_outputs.c
index 467501b..ac195e9 100644
--- a/src/via_outputs.c
+++ b/src/via_outputs.c
@@ -148,34 +148,6 @@ viaDIP0SetDataDriveStrength(ScrnInfoPtr pScrn, CARD8
dataDriveStrength)
}
/*
- * Sets DVP0 (Digital Video Port 0) I/O pad state.
- */
-void
-viaDVP0EnableIOPads(ScrnInfoPtr pScrn, CARD8 ioPadState)
-{
- vgaHWPtr hwp = VGAHWPTR(pScrn);
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered viaDVP0EnableIOPads.\n"));
-
- /* Set DVP0 I/O pad state. */
- /* 3C5.1E[7:6] - DVP0 Power Control
- * 0x: Pad always off
- * 10: Depend on the other control signal
- * 11: Pad on/off according to the
- * Power Management Status (PMS) */
- ViaSeqMask(hwp, 0x1E, ioPadState << 6, 0xC0);
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "DVP0 I/O Pad State: %s\n",
- (ioPadState & 0x02) ?
- (ioPadState & 0x01) ? "Automatic On / Off" : "Conditional"
- : "Off");
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting viaDVP0EnableIOPads.\n"));
-}
-
-/*
* Sets DVP0 (Digital Video Port 0) clock I/O pad drive strength.
*/
void
diff --git a/src/via_ums.h b/src/via_ums.h
index 23fc3ed..7ba546b 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -314,6 +314,26 @@ viaDVP0SetDisplaySource(ScrnInfoPtr pScrn, CARD8
displaySource)
}
/*
+ * Sets DVP0 (Digital Video Port 0) I/O pad state.
+ */
+static inline void
+viaDVP0EnableIOPads(ScrnInfoPtr pScrn, CARD8 ioPadState)
+{
+ /* 3C5.1E[7:6] - DVP0 Power Control
+ * 0x: Pad always off
+ * 10: Depend on the other control signal
+ * 11: Pad on/off according to the
+ * Power Management Status (PMS) */
+ ViaSeqMask(VGAHWPTR(pScrn), 0x1E, ioPadState << 6, BIT(7) | BIT(6));
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "DVP0 I/O Pad State: %s\n",
+ ((ioPadState & (BIT(1) | BIT(0))) == 0x03) ? "On" :
+ ((ioPadState & (BIT(1) | BIT(0))) == 0x02) ?
"Conditional" :
+ ((ioPadState & (BIT(1) | BIT(0))) == 0x01) ? "Off" :
+ "Off"));
+}
+
+/*
* Sets the display source of DVP1 (Digital Video Port 1) interface.
*/
static inline void
@@ -680,7 +700,6 @@ void viaDIP0SetClockDriveStrength(ScrnInfoPtr pScrn,
CARD8 clockDriveStrength);
void viaDIP0SetDataDriveStrength(ScrnInfoPtr pScrn,
CARD8 dataDriveStrength);
-void viaDVP0EnableIOPads(ScrnInfoPtr pScrn, CARD8 ioPadState);
void viaDVP0SetClockDriveStrength(ScrnInfoPtr pScrn,
CARD8 clockDriveStrength);
void viaDVP0SetDataDriveStrength(ScrnInfoPtr pScrn,
commit e638fa30c5d95a71e3beb224a1556b3ac9a3082d
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Tue Jun 6 17:39:31 2017 -0700
Removing unnecessary calls to viaFPIOPadSetting
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_fp.c b/src/via_fp.c
index 4ba1270..813236e 100644
--- a/src/via_fp.c
+++ b/src/via_fp.c
@@ -1228,7 +1228,6 @@ via_fp_prepare(xf86OutputPtr output)
ScrnInfoPtr pScrn = output->scrn;
via_fp_dpms(output, DPMSModeOff);
- viaFPIOPadSetting(pScrn, FALSE);
}
static void
@@ -1237,7 +1236,6 @@ via_fp_commit(xf86OutputPtr output)
ScrnInfoPtr pScrn = output->scrn;
via_fp_dpms(output, DPMSModeOn);
- viaFPIOPadSetting(pScrn, TRUE);
}
static void
commit ebe4572bb178389437407aee59a7f6ba4705eeef
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Tue Jun 6 16:12:28 2017 -0700
Converting viaLVDS2SetIOPadSetting to an inline function
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_fp.c b/src/via_fp.c
index 50df8dd..4ba1270 100644
--- a/src/via_fp.c
+++ b/src/via_fp.c
@@ -207,28 +207,6 @@ viaLVDS1SetOutputFormat(ScrnInfoPtr pScrn, CARD8
outputFormat)
}
/*
- * Sets CX700 or later single chipset's LVDS2 I/O pad state.
- */
-static void
-viaLVDS2SetIOPadSetting(ScrnInfoPtr pScrn, CARD8 ioPadState)
-{
- vgaHWPtr hwp = VGAHWPTR(pScrn);
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered viaLVDS2SetIOPadSetting.\n"));
-
- /* Set LVDS2 I/O pad state. */
- /* 3C5.2A[3:2] - LVDS2 I/O Pad Control */
- ViaSeqMask(hwp, 0x2A, ioPadState << 2, 0x0C);
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "LVDS2 I/O Pad State: %d\n",
- (ioPadState & 0x03));
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting viaLVDS2SetIOPadSetting.\n"));
-}
-
-/*
* Sets IGA1 or IGA2 as the display output source for VIA Technologies
* Chrome IGP LVDS2 integrated LVDS transmitter.
*/
diff --git a/src/via_ums.h b/src/via_ums.h
index 91d6410..23fc3ed 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -594,6 +594,20 @@ viaLVDS2SetPower(ScrnInfoPtr pScrn, Bool powerState)
}
/*
+ * Sets CX700 or later single chipset's LVDS2 I/O pad state.
+ */
+static inline void
+viaLVDS2SetIOPadSetting(ScrnInfoPtr pScrn, CARD8 ioPadState)
+{
+ /* Set LVDS2 I/O pad state. */
+ /* 3C5.2A[3:2] - LVDS2 I/O Pad Control */
+ ViaSeqMask(VGAHWPTR(pScrn), 0x2A, ioPadState << 2, 0x0C);
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "LVDS2 I/O Pad State: %d\n",
+ (ioPadState & 0x03)));
+}
+
+/*
* Sets CX700 / VX700 and VX800 chipsets' TMDS (DVI) power state.
*/
static inline void
commit 45c057d98f7ac14b50ab79cbc812b16d03274107
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Tue Jun 6 15:44:41 2017 -0700
Converting viaLVDS1SetIOPadSetting to an inline function
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_fp.c b/src/via_fp.c
index d66173e..50df8dd 100644
--- a/src/via_fp.c
+++ b/src/via_fp.c
@@ -105,28 +105,6 @@ static DisplayModeRec OLPCMode = {
#define TD3 25
/*
- * Sets CX700 or later single chipset's LVDS1 I/O pad state.
- */
-void
-viaLVDS1SetIOPadSetting(ScrnInfoPtr pScrn, CARD8 ioPadState)
-{
- vgaHWPtr hwp = VGAHWPTR(pScrn);
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered viaLVDS1SetIOPadSetting.\n"));
-
- /* Set LVDS1 I/O pad state. */
- /* 3C5.2A[1:0] - LVDS1 I/O Pad Control */
- ViaSeqMask(hwp, 0x2A, ioPadState, 0x03);
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "LVDS1 I/O Pad State: %d\n",
- (ioPadState & 0x03));
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting viaLVDS1SetIOPadSetting.\n"));
-}
-
-/*
* Sets IGA1 or IGA2 as the display output source for VIA Technologies
* Chrome IGP LVDS1 integrated LVDS transmitter.
*/
diff --git a/src/via_ums.h b/src/via_ums.h
index 532a946..91d6410 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -564,6 +564,19 @@ viaLVDS1SetSoftDisplayPeriod(ScrnInfoPtr pScrn, Bool
softOn)
}
/*
+ * Sets CX700 or later single chipset's LVDS1 I/O pad state.
+ */
+static inline void
+viaLVDS1SetIOPadSetting(ScrnInfoPtr pScrn, CARD8 ioPadState)
+{
+ /* 3C5.2A[1:0] - LVDS1 I/O Pad Control */
+ ViaSeqMask(VGAHWPTR(pScrn), 0x2A, ioPadState, BIT(1) | BIT(0));
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "LVDS1 I/O Pad State: %d\n",
+ (ioPadState & (BIT(1) | BIT(0)))));
+}
+
+/*
* Sets CX700 / VX700 and VX800 chipsets' LVDS2 power state.
*/
static inline void
@@ -694,7 +707,6 @@ void viaAnalogProbe(ScrnInfoPtr pScrn);
void viaAnalogInit(ScrnInfoPtr pScrn);
/* via_fp.c */
-void viaLVDS1SetIOPadSetting(ScrnInfoPtr pScrn, CARD8 ioPadState);
void viaFPProbe(ScrnInfoPtr pScrn);
void viaFPInit(ScrnInfoPtr pScrn);
commit 3880e431f8a57e6496d609d00b272b07a305a08f
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Tue Jun 6 14:41:05 2017 -0700
Removing unnecessary code from iga1_crtc_mode_set
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_display.c b/src/via_display.c
index 95ce340..61ce05c 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -3741,9 +3741,6 @@ iga1_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
viaIGAInitCommon(pScrn);
viaIGA1Init(pScrn);
- /* Disable IGA1 */
- ViaSeqMask(hwp, 0x59, 0x00, 0x80);
-
ViaPrintMode(pScrn, adjusted_mode);
/* Set color depth. */
@@ -3760,9 +3757,6 @@ iga1_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
ViaSetUseExternalClock(hwp);
ViaCrtcMask(hwp, 0x6B, 0x00, 0x01);
- /* Enable IGA1 */
- ViaSeqMask(hwp, 0x59, 0x80, 0x80);
-
viaIGA1SetFBStartingAddress(crtc, x, y);
VIAVidAdjustFrame(pScrn, x, y);
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
