[openchrome-devel] xf86-video-openchrome: 7 commits - configure.ac src/via_display.c src/via_driver.c src/via_driver.h src/via_exa.c src/via_exa_h2.c src/via_exa_h6.c
Kevin Brace
kevinbrace at kemper.freedesktop.org
Sun Jul 14 01:28:29 UTC 2019
configure.ac | 2 +-
src/via_display.c | 4 ++++
src/via_driver.c | 3 +--
src/via_driver.h | 2 ++
src/via_exa.c | 2 +-
src/via_exa_h2.c | 4 ++--
src/via_exa_h6.c | 4 ++--
7 files changed, 13 insertions(+), 8 deletions(-)
New commits:
commit 2cd19b2c21be443586a2c25ef399cdd5d2baaa8f
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Jul 13 18:28:15 2019 -0700
Version bumped to 0.6.191
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/configure.ac b/configure.ac
index 7bc4aac..ebef80d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-openchrome],
- [0.6.190],
+ [0.6.191],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit f7f7d58dde59b9df559a9faaa8ff04ad1e7c5019
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Jul 13 18:26:36 2019 -0700
xf86NewOption parameter of xf86CollectOptions() should be null
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_driver.c b/src/via_driver.c
index bc595dc..61dd084 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -948,7 +948,6 @@ xf86CrtcConfigFuncsRec via_xf86crtc_config_funcs = {
static Bool
VIAPreInit(ScrnInfoPtr pScrn, int flags)
{
- XF86OptionPtr option = xf86NewOption("MigrationHeuristic", "greedy");
EntityInfoPtr pEnt;
VIAPtr pVia;
VIADisplayPtr pVIADisplay;
@@ -1260,7 +1259,7 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
}
}
- xf86CollectOptions(pScrn, option);
+ xf86CollectOptions(pScrn, NULL);
if (!VIASetupDefaultOptions(pScrn)) {
goto fail;
commit ad7d6ec339f360ae3f4f74d0766824227d2421d0
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Jul 13 18:09:32 2019 -0700
Call RING_VARS macro at the beginning of viaExaCopy_H6()
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_exa_h6.c b/src/via_exa_h6.c
index 14d6b88..1f0f91a 100644
--- a/src/via_exa_h6.c
+++ b/src/via_exa_h6.c
@@ -238,11 +238,11 @@ viaExaCopy_H6(PixmapPtr pDstPixmap, int srcX, int srcY, int dstX, int dstY,
VIAPtr pVia = VIAPTR(pScrn);
ViaTwodContext *tdc = &pVia->td;
+ RING_VARS;
+
if (!width || !height)
return;
- RING_VARS;
-
if (tdc->cmd & VIA_GEC_DECY) {
srcY += height - 1;
dstY += height - 1;
commit bc59e9d626fc22a8255b71ff71c840fb553547fb
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Jul 13 18:06:42 2019 -0700
Call RING_VARS macro at the beginning of viaExaCopy_H2()
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_exa_h2.c b/src/via_exa_h2.c
index 1b91bb2..0fd6498 100644
--- a/src/via_exa_h2.c
+++ b/src/via_exa_h2.c
@@ -237,6 +237,8 @@ viaExaCopy_H2(PixmapPtr pDstPixmap, int srcX, int srcY, int dstX, int dstY,
VIAPtr pVia = VIAPTR(pScrn);
ViaTwodContext *tdc = &pVia->td;
+ RING_VARS;
+
if (!width || !height)
return;
@@ -251,8 +253,6 @@ viaExaCopy_H2(PixmapPtr pDstPixmap, int srcX, int srcY, int dstX, int dstY,
}
val = VIA_PITCH_ENABLE | (dstPitch >> 3) << 16 | (tdc->srcPitch >> 3);
- RING_VARS;
-
BEGIN_RING(16);
OUT_RING_H1(VIA_REG_GEMODE, tdc->mode);
OUT_RING_H1(VIA_REG_SRCBASE, tdc->srcOffset >> 3);
commit 8b1ffce645c4bf4065009c9c6b95767bb2dace48
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Jul 13 17:58:46 2019 -0700
Declare viaSetClippingRectangle() as an extern type function
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_driver.h b/src/via_driver.h
index bd84ec9..0ef15d3 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -363,6 +363,8 @@ const xf86CrtcFuncsRec iga2_crtc_funcs;
/* In via_exa.c. */
Bool viaInitExa(ScreenPtr pScreen);
Bool viaAccelSetMode(int bpp, ViaTwodContext * tdc);
+void viaSetClippingRectangle(ScrnInfoPtr pScrn,
+ int x1, int y1, int x2, int y2);
void viaAccelSync(ScrnInfoPtr);
void viaExitAccel(ScreenPtr);
void viaFinishInitAccel(ScreenPtr);
commit 11b5315d4b4f7be45741fd8442e827b2b57c65e2
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Jul 12 20:27:19 2019 -0700
Declare viaFlushPCI() as a static type function
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_exa.c b/src/via_exa.c
index 0e464ea..7708610 100644
--- a/src/via_exa.c
+++ b/src/via_exa.c
@@ -62,7 +62,7 @@ viaDumpDMA(ViaCommandBuffer *cb)
ErrorF("\n");
}
-void
+static void
viaFlushPCI(ViaCommandBuffer *cb)
{
register CARD32 *bp = cb->buf;
commit be34681ad83a88ba54b6aad37699c2289f07bd9f
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Jul 12 20:16:40 2019 -0700
Declare variables only when debug mode is on inside via_display.c
Specifically, within viaIGA1SetFBStartingAddress() and
viaIGA2SetFBStartingAddress().
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_display.c b/src/via_display.c
index b682a45..1a84bea 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -1197,7 +1197,9 @@ viaIGA1SetFBStartingAddress(xf86CrtcPtr crtc, int x, int y)
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
drmmode_ptr drmmode = drmmode_crtc->drmmode;
CARD32 Base;
+#ifdef HAVE_DEBUG
CARD8 cr0c, cr0d, cr34, cr48;
+#endif
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered viaIGA1SetFBStartingAddress.\n"));
@@ -2342,7 +2344,9 @@ viaIGA2SetFBStartingAddress(xf86CrtcPtr crtc, int x, int y)
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
drmmode_ptr drmmode = drmmode_crtc->drmmode;
CARD32 Base, tmp;
+#ifdef HAVE_DEBUG
CARD8 cr62, cr63, cr64, cra3;
+#endif
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered viaIGA2SetFBStartingAddress.\n"));
More information about the openchrome-devel
mailing list