[Openchrome-devel] xf86-video-openchrome: 5 commits - configure.ac src/via_sii164.c src/via_vt162x.c src/via_vt1632.c
Kevin Brace
kevinbrace at kemper.freedesktop.org
Tue Aug 30 19:57:06 UTC 2016
configure.ac | 2 -
src/via_sii164.c | 67 +++++++++++++++++++++++++++----------------------------
src/via_vt162x.c | 1
src/via_vt1632.c | 67 +++++++++++++++++++++++++++----------------------------
4 files changed, 70 insertions(+), 67 deletions(-)
New commits:
commit db9e2ddd7df7ab66310938c006cd1867a95beb33
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Tue Aug 30 12:56:38 2016 -0700
Version bumped to 0.5.149
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/configure.ac b/configure.ac
index d9bcdfc..0ab513d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.5.148],
+ [0.5.149],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit 2893cf3de569848895430d0952965bcfb1eb183d
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Tue Aug 30 12:55:01 2016 -0700
Adding VX900 chipset to VT1625 TV encoder initialization
Considering that VX900 chipset is a superset of VX855 chipset,
there is probably no harm in adding it when the code runs through
ViaSetTVClockSource function.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_vt162x.c b/src/via_vt162x.c
index 897e0c4..3bcfe18 100644
--- a/src/via_vt162x.c
+++ b/src/via_vt162x.c
@@ -48,6 +48,7 @@ ViaSetTVClockSource(xf86CrtcPtr crtc)
case VIA_CX700:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
/* IGA1 */
if (!iga->index) {
/* Fixing it to DVP1 for IGA1. */
commit 5b661b1de758270643a453d9dbddc4d220696380
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Tue Aug 30 09:53:09 2016 -0700
Moved via_sii164_mode_set inside via_sii164.c
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_sii164.c b/src/via_sii164.c
index e100552..ec69644 100644
--- a/src/via_sii164.c
+++ b/src/via_sii164.c
@@ -176,40 +176,6 @@ exit:
return status;
}
-void
-via_sii164_mode_set(xf86OutputPtr output, DisplayModePtr mode,
- DisplayModePtr adjusted_mode)
-{
- ScrnInfoPtr pScrn = output->scrn;
- drmmode_crtc_private_ptr iga = output->crtc->driver_private;
- VIAPtr pVia = VIAPTR(pScrn);
- viaSiI164RecPtr pSiI164Rec = output->driver_private;
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered via_sii164_mode_set.\n"));
-
- switch (pVia->Chipset) {
- case VIA_CX700:
- case VIA_VX800:
- case VIA_VX855:
- case VIA_VX900:
- viaDVP1SetDisplaySource(pScrn, iga->index ? 0x01 : 0x00);
- viaDVP1EnableIOPads(pScrn, 0x03);
- break;
- default:
- break;
- }
-
- via_sii164_dump_registers(pScrn, pSiI164Rec->SiI164I2CDev);
-
- viaSiI164InitRegisters(pScrn, pSiI164Rec->SiI164I2CDev);
-
- via_sii164_dump_registers(pScrn, pSiI164Rec->SiI164I2CDev);
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting via_sii164_mode_set.\n"));
-}
-
static void
via_sii164_create_resources(xf86OutputPtr output)
{
@@ -295,6 +261,40 @@ via_sii164_commit(xf86OutputPtr output)
{
}
+static void
+via_sii164_mode_set(xf86OutputPtr output, DisplayModePtr mode,
+ DisplayModePtr adjusted_mode)
+{
+ ScrnInfoPtr pScrn = output->scrn;
+ drmmode_crtc_private_ptr iga = output->crtc->driver_private;
+ VIAPtr pVia = VIAPTR(pScrn);
+ viaSiI164RecPtr pSiI164Rec = output->driver_private;
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Entered via_sii164_mode_set.\n"));
+
+ switch (pVia->Chipset) {
+ case VIA_CX700:
+ case VIA_VX800:
+ case VIA_VX855:
+ case VIA_VX900:
+ viaDVP1SetDisplaySource(pScrn, iga->index ? 0x01 : 0x00);
+ viaDVP1EnableIOPads(pScrn, 0x03);
+ break;
+ default:
+ break;
+ }
+
+ via_sii164_dump_registers(pScrn, pSiI164Rec->SiI164I2CDev);
+
+ viaSiI164InitRegisters(pScrn, pSiI164Rec->SiI164I2CDev);
+
+ via_sii164_dump_registers(pScrn, pSiI164Rec->SiI164I2CDev);
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Exiting via_sii164_mode_set.\n"));
+}
+
static xf86OutputStatus
via_sii164_detect(xf86OutputPtr output)
{
commit b15034b73d2e35899b74a0c9c733cdb72de1a324
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Tue Aug 30 09:41:11 2016 -0700
Moved via_vt1632_mode_set inside via_vt1632.c
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_vt1632.c b/src/via_vt1632.c
index 7f85036..59e7d08 100644
--- a/src/via_vt1632.c
+++ b/src/via_vt1632.c
@@ -189,40 +189,6 @@ exit:
return status;
}
-void
-via_vt1632_mode_set(xf86OutputPtr output, DisplayModePtr mode,
- DisplayModePtr adjusted_mode)
-{
- ScrnInfoPtr pScrn = output->scrn;
- drmmode_crtc_private_ptr iga = output->crtc->driver_private;
- VIAPtr pVia = VIAPTR(pScrn);
- viaVT1632RecPtr pVIAVT1632Rec = output->driver_private;
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered via_vt1632_mode_set.\n"));
-
- switch (pVia->Chipset) {
- case VIA_CX700:
- case VIA_VX800:
- case VIA_VX855:
- case VIA_VX900:
- viaDVP1SetDisplaySource(pScrn, iga->index ? 0x01 : 0x00);
- viaDVP1EnableIOPads(pScrn, 0x03);
- break;
- default:
- break;
- }
-
- via_vt1632_dump_registers(pScrn, pVIAVT1632Rec->VT1632I2CDev);
-
- viaVT1632InitRegisters(pScrn, pVIAVT1632Rec->VT1632I2CDev);
-
- via_vt1632_dump_registers(pScrn, pVIAVT1632Rec->VT1632I2CDev);
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting via_vt1632_mode_set.\n"));
-}
-
static void
via_vt1632_create_resources(xf86OutputPtr output)
{
@@ -308,6 +274,40 @@ via_vt1632_commit(xf86OutputPtr output)
{
}
+static void
+via_vt1632_mode_set(xf86OutputPtr output, DisplayModePtr mode,
+ DisplayModePtr adjusted_mode)
+{
+ ScrnInfoPtr pScrn = output->scrn;
+ drmmode_crtc_private_ptr iga = output->crtc->driver_private;
+ VIAPtr pVia = VIAPTR(pScrn);
+ viaVT1632RecPtr pVIAVT1632Rec = output->driver_private;
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Entered via_vt1632_mode_set.\n"));
+
+ switch (pVia->Chipset) {
+ case VIA_CX700:
+ case VIA_VX800:
+ case VIA_VX855:
+ case VIA_VX900:
+ viaDVP1SetDisplaySource(pScrn, iga->index ? 0x01 : 0x00);
+ viaDVP1EnableIOPads(pScrn, 0x03);
+ break;
+ default:
+ break;
+ }
+
+ via_vt1632_dump_registers(pScrn, pVIAVT1632Rec->VT1632I2CDev);
+
+ viaVT1632InitRegisters(pScrn, pVIAVT1632Rec->VT1632I2CDev);
+
+ via_vt1632_dump_registers(pScrn, pVIAVT1632Rec->VT1632I2CDev);
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Exiting via_vt1632_mode_set.\n"));
+}
+
static xf86OutputStatus
via_vt1632_detect(xf86OutputPtr output)
{
commit c3a6a64cf31606360ca54bcac2e2527a87dcadf5
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Tue Aug 30 09:35:21 2016 -0700
Proactively turn on DVP1 I/O pads when using DVI in new devices
When an external TMDS transmitter is being utilized, turn on DVP1
(Digital Video Port 1) I/O pads in CX700 chipset through VX900
chipset.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_sii164.c b/src/via_sii164.c
index 6bea7f0..e100552 100644
--- a/src/via_sii164.c
+++ b/src/via_sii164.c
@@ -194,6 +194,7 @@ via_sii164_mode_set(xf86OutputPtr output, DisplayModePtr mode,
case VIA_VX855:
case VIA_VX900:
viaDVP1SetDisplaySource(pScrn, iga->index ? 0x01 : 0x00);
+ viaDVP1EnableIOPads(pScrn, 0x03);
break;
default:
break;
diff --git a/src/via_vt1632.c b/src/via_vt1632.c
index 244875d..7f85036 100644
--- a/src/via_vt1632.c
+++ b/src/via_vt1632.c
@@ -207,6 +207,7 @@ via_vt1632_mode_set(xf86OutputPtr output, DisplayModePtr mode,
case VIA_VX855:
case VIA_VX900:
viaDVP1SetDisplaySource(pScrn, iga->index ? 0x01 : 0x00);
+ viaDVP1EnableIOPads(pScrn, 0x03);
break;
default:
break;
More information about the Openchrome-devel
mailing list