configure.ac | 2 +-
src/via_vt1632.c | 39 +++++++++++++++++++++++----------------
src/via_vt1632.h | 1 -
3 files changed, 24 insertions(+), 18 deletions(-)
New commits:
commit b0cea97d2a5a9f405ff4ed893bb03fe4031f4ea7
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Aug 18 21:27:50 2016 -0700
Version bumped to 0.5.131
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/configure.ac b/configure.ac
index 9fa1e9d..c22ee48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.5.130],
+ [0.5.131],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit 01d1862252ff0aa93cafb8a20e6f8182cfa3dded
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Aug 18 21:24:24 2016 -0700
Added debug messages to via_vt1632_restore
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_vt1632.c b/src/via_vt1632.c
index d104b1b..8ae9c8e 100644
--- a/src/via_vt1632.c
+++ b/src/via_vt1632.c
@@ -305,8 +305,14 @@ via_vt1632_restore(xf86OutputPtr output)
ScrnInfoPtr pScrn = output->scrn;
ViaVT1632Ptr pVIAVT1632Rec = output->driver_private;
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Entered via_vt1632_restore.\n"));
+
viaVT1632RestoreRegisters(pScrn, pVIAVT1632Rec->VT1632I2CDev,
pVIAVT1632Rec);
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Exiting via_vt1632_restore.\n"));
}
static int
commit 4ca31806c5acbd0493dc6f758692fbb837dee006
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Aug 18 21:17:20 2016 -0700
Rewrite of viaVT1632RestoreRegisters
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_vt1632.c b/src/via_vt1632.c
index 1ebf764..d104b1b 100644
--- a/src/via_vt1632.c
+++ b/src/via_vt1632.c
@@ -161,22 +161,19 @@ viaVT1632SaveRegisters(ScrnInfoPtr pScrn, I2CDevPtr pDev,
"Exiting viaVT1632SaveRegisters.\n"));
}
-void
-viaVT1632RestoreRegisters(xf86OutputPtr output)
+static void
+viaVT1632RestoreRegisters(ScrnInfoPtr pScrn, I2CDevPtr pDev,
+ ViaVT1632Ptr pVIAVT1632Rec)
{
- ViaVT1632Ptr Private = output->driver_private;
- ScrnInfoPtr pScrn = output->scrn;
-
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered viaVT1632RestoreRegisters.\n"));
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "VT1632A: Restoring registers 0x08, 0x09, "
- "0x0A, and 0x0C.\n"));
- xf86I2CWriteByte(Private->VT1632I2CDev, 0x08, Private->Register08);
- xf86I2CWriteByte(Private->VT1632I2CDev, 0x09, Private->Register09);
- xf86I2CWriteByte(Private->VT1632I2CDev, 0x0A, Private->Register0A);
- xf86I2CWriteByte(Private->VT1632I2CDev, 0x0C, Private->Register0C);
+ "Restoring VT1632 registers.\n"));
+ xf86I2CWriteByte(pDev, 0x08, pVIAVT1632Rec->Register08);
+ xf86I2CWriteByte(pDev, 0x09, pVIAVT1632Rec->Register09);
+ xf86I2CWriteByte(pDev, 0x0A, pVIAVT1632Rec->Register0A);
+ xf86I2CWriteByte(pDev, 0x0C, pVIAVT1632Rec->Register0C);
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Exiting viaVT1632RestoreRegisters.\n"));
@@ -305,7 +302,11 @@ via_vt1632_save(xf86OutputPtr output)
static void
via_vt1632_restore(xf86OutputPtr output)
{
- viaVT1632RestoreRegisters(output);
+ ScrnInfoPtr pScrn = output->scrn;
+ ViaVT1632Ptr pVIAVT1632Rec = output->driver_private;
+
+ viaVT1632RestoreRegisters(pScrn, pVIAVT1632Rec->VT1632I2CDev,
+ pVIAVT1632Rec);
}
static int
diff --git a/src/via_vt1632.h b/src/via_vt1632.h
index 8edf3f3..111aee3 100644
--- a/src/via_vt1632.h
+++ b/src/via_vt1632.h
@@ -45,7 +45,6 @@ typedef struct _ViaVT1632 {
const xf86OutputFuncsRec via_dvi_funcs;
-void viaVT1632RestoreRegisters(xf86OutputPtr output);
int via_vt1632_mode_valid(xf86OutputPtr output, DisplayModePtr pMode);
Bool viaVT1632Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus);
commit a086c6d4721c9b6a075f2d69bfc58ae8f2d3f116
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Aug 18 14:53:37 2016 -0700
Changing via_dvi_restore to via_vt1632_restore
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_vt1632.c b/src/via_vt1632.c
index 6512d70..1ebf764 100644
--- a/src/via_vt1632.c
+++ b/src/via_vt1632.c
@@ -303,7 +303,7 @@ via_vt1632_save(xf86OutputPtr output)
}
static void
-via_dvi_restore(xf86OutputPtr output)
+via_vt1632_restore(xf86OutputPtr output)
{
viaVT1632RestoreRegisters(output);
}
@@ -378,7 +378,7 @@ const xf86OutputFuncsRec via_dvi_funcs = {
#endif
.dpms = via_vt1632_dpms,
.save = via_vt1632_save,
- .restore = via_dvi_restore,
+ .restore = via_vt1632_restore,
.mode_valid = via_dvi_mode_valid,
.mode_fixup = via_dvi_mode_fixup,
.prepare = via_dvi_prepare,
commit b3a2e455c5ec0af11b07d947f35507a680833fb2
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Aug 18 14:17:11 2016 -0700
Changing via_vt1632_restore to viaVT1632RestoreRegisters
This function is located inside via_vt1632.c.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_vt1632.c b/src/via_vt1632.c
index aed3ed9..6512d70 100644
--- a/src/via_vt1632.c
+++ b/src/via_vt1632.c
@@ -162,13 +162,13 @@ viaVT1632SaveRegisters(ScrnInfoPtr pScrn, I2CDevPtr pDev,
}
void
-via_vt1632_restore(xf86OutputPtr output)
+viaVT1632RestoreRegisters(xf86OutputPtr output)
{
ViaVT1632Ptr Private = output->driver_private;
ScrnInfoPtr pScrn = output->scrn;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered via_vt1632_restore.\n"));
+ "Entered viaVT1632RestoreRegisters.\n"));
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"VT1632A: Restoring registers 0x08, 0x09, "
@@ -179,7 +179,7 @@ via_vt1632_restore(xf86OutputPtr output)
xf86I2CWriteByte(Private->VT1632I2CDev, 0x0C, Private->Register0C);
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting via_vt1632_restore.\n"));
+ "Exiting viaVT1632RestoreRegisters.\n"));
}
int
@@ -305,7 +305,7 @@ via_vt1632_save(xf86OutputPtr output)
static void
via_dvi_restore(xf86OutputPtr output)
{
- via_vt1632_restore(output);
+ viaVT1632RestoreRegisters(output);
}
static int
diff --git a/src/via_vt1632.h b/src/via_vt1632.h
index 8b272c5..8edf3f3 100644
--- a/src/via_vt1632.h
+++ b/src/via_vt1632.h
@@ -45,7 +45,7 @@ typedef struct _ViaVT1632 {
const xf86OutputFuncsRec via_dvi_funcs;
-void via_vt1632_restore(xf86OutputPtr output);
+void viaVT1632RestoreRegisters(xf86OutputPtr output);
int via_vt1632_mode_valid(xf86OutputPtr output, DisplayModePtr pMode);
Bool viaVT1632Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus);
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
