[openchrome-devel] xf86-video-openchrome: 7 commits - configure.ac src/via_display.c src/via_driver.h src/via_fp.c
Kevin Brace
kevinbrace at kemper.freedesktop.org
Fri Jul 12 21:38:26 UTC 2019
configure.ac | 2 +-
src/via_display.c | 21 +++++++--------------
src/via_driver.h | 1 -
src/via_fp.c | 1 -
4 files changed, 8 insertions(+), 17 deletions(-)
New commits:
commit c7edee2562dce78f59d0821571aad18ab29ca40d
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Jul 12 14:34:41 2019 -0700
Version bumped to 0.6.188
Includes a fix for debug messages always getting enabled. Now
--enable-debug option works correctly when generating a compilation
script.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/configure.ac b/configure.ac
index 734a3b5..ad796d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-openchrome],
- [0.6.187],
+ [0.6.188],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit 33ad30a53868e6ab73ca2a4ae5c3c9a2c9e6be4b
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Jul 12 14:32:48 2019 -0700
Stop defining HAVE_DEBUG macro keyword from via_driver.h
Defining HAVE_DEBUG macro keyword inside via_driver.h defeats the
purpose of configure.ac based enabling of device driver debug
messages.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_driver.h b/src/via_driver.h
index d31dffc..bd84ec9 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -27,7 +27,6 @@
#define _VIA_DRIVER_H_ 1
//#define VIA_DEBUG_COMPOSITE 1
-#define HAVE_DEBUG 1
#ifdef HAVE_DEBUG
#define DEBUG(x) x
commit 7b61b21bd717a003b189b712bad05fc99f925dc8
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Jul 12 14:30:48 2019 -0700
Define temp variable properly inside viaIGAInitCommon()
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_display.c b/src/via_display.c
index f35bc62..b682a45 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -596,10 +596,7 @@ viaIGAInitCommon(ScrnInfoPtr pScrn)
VIAPtr pVia = VIAPTR(pScrn);
VIADisplayPtr pVIADisplay = pVia->pVIADisplay;
VIARegPtr Regs = &pVIADisplay->SavedReg;
- CARD8 i;
-#ifdef HAVE_DEBUG
- CARD8 temp;
-#endif
+ CARD8 i, temp;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered viaIGAInitCommon.\n"));
commit 8eaf7ab409504f29015c06ad0e57323cde12636a
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Jul 12 14:29:15 2019 -0700
Remove uninitialized variable warning from via_display.c
In particular, removing it from viaIGA1SetFBStartingAddress().
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_display.c b/src/via_display.c
index 4325059..f35bc62 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -1226,23 +1226,19 @@ viaIGA1SetFBStartingAddress(xf86CrtcPtr crtc, int x, int y)
#ifdef HAVE_DEBUG
cr0d = hwp->readCrtc(hwp, 0x0D);
- cr0c = hwp->readCrtc(hwp, 0x0C);
- cr34 = hwp->readCrtc(hwp, 0x34);
- if (!(pVia->Chipset == VIA_CLE266 && CLE266_REV_IS_AX(pVia->ChipRev))) {
- cr48 = hwp->readCrtc(hwp, 0x48);
- }
-
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"CR0D: 0x%02X\n", cr0d));
+ cr0c = hwp->readCrtc(hwp, 0x0C);
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"CR0C: 0x%02X\n", cr0c));
+ cr34 = hwp->readCrtc(hwp, 0x34);
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"CR34: 0x%02X\n", cr34));
if (!(pVia->Chipset == VIA_CLE266 && CLE266_REV_IS_AX(pVia->ChipRev))) {
+ cr48 = hwp->readCrtc(hwp, 0x48);
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"CR48: 0x%02X\n", cr48));
}
-
#endif
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
commit 62073a5eddedd7cb8bf127f26e2ce1acf44c43cb
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Jul 12 14:27:44 2019 -0700
Declare variables first inside ViaShadowCRTCSetMode()
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_display.c b/src/via_display.c
index a4f8668..4325059 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -3091,11 +3091,11 @@ viaIGA2Restore(ScrnInfoPtr pScrn)
void
ViaShadowCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
{
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaShadowCRTCSetMode\n"));
-
vgaHWPtr hwp = VGAHWPTR(pScrn);
CARD16 temp;
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaShadowCRTCSetMode\n"));
+
temp = (mode->CrtcHTotal >> 3) - 5;
hwp->writeCrtc(hwp, 0x6D, temp & 0xFF);
ViaCrtcMask(hwp, 0x71, temp >> 5, 0x08);
commit ed29a6e4411404ead8539aab67f2d8dbe2802d95
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Jul 12 14:27:08 2019 -0700
Static declaration for VIALoadRgbLut()
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_display.c b/src/via_display.c
index a01da20..a4f8668 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -509,7 +509,7 @@ viaIGA2SetHIDisplayLocation(ScrnInfoPtr pScrn,
}
}
-void
+static void
VIALoadRgbLut(ScrnInfoPtr pScrn, int start, int numColors, LOCO *colors)
{
vgaHWPtr hwp = VGAHWPTR(pScrn);
commit e72450fa77f36b16bbc7abd7f0497eee7cc12d27
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Jul 12 14:26:08 2019 -0700
Eliminate unused variable warning from viaFPGetFPInfoScratchPad()
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_fp.c b/src/via_fp.c
index a9d1930..91ef73d 100644
--- a/src/via_fp.c
+++ b/src/via_fp.c
@@ -705,7 +705,6 @@ static void
viaFPGetFPInfoScratchPad(xf86OutputPtr output)
{
ScrnInfoPtr pScrn = output->scrn;
- vgaHWPtr hwp = VGAHWPTR(pScrn);
VIAPtr pVia = VIAPTR(pScrn);
VIADisplayPtr pVIADisplay = pVia->pVIADisplay;
VIAFPPtr pVIAFP = (VIAFPPtr) output->driver_private;
More information about the openchrome-devel
mailing list