[Openchrome-devel] xf86-video-openchrome: 10 commits - configure.ac src/via_display.c src/via_driver.c src/via_ums.c src/via_ums.h
Kevin Brace
kevinbrace at kemper.freedesktop.org
Sat Jun 4 15:13:33 UTC 2016
configure.ac | 2 +-
src/via_display.c | 6 ++++--
src/via_driver.c | 2 +-
src/via_ums.c | 50 +++++++++++++++++++++++++-------------------------
src/via_ums.h | 2 +-
5 files changed, 32 insertions(+), 30 deletions(-)
New commits:
commit 915bb90feb7235f4ee3dd701f5c60c31884cb026
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Jun 4 08:12:51 2016 -0700
Version bumped to 0.4.168
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/configure.ac b/configure.ac
index 9e4f4db..c865aee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.4.167],
+ [0.4.168],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit bcfdc5b332528457215d578258755dec4880b24e
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Jun 4 08:10:24 2016 -0700
Setting X and Y origin within iga2_crtc_mode_set differently
iga2_crtc_mode_set function should not be calling iga2_crtc_set_origin
function directly, and instead equivalent functionality should be
implemented within iga2_crtc_mode_set function.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_display.c b/src/via_display.c
index bebfd40..e7c9da5 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -3074,7 +3074,8 @@ iga2_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
viaIGA2DisplayChannel(pScrn, TRUE);
- iga2_crtc_set_origin(crtc, crtc->x, crtc->y);
+ viaIGA2SetFBStartingAddress(crtc, x, y);
+ VIAVidAdjustFrame(pScrn, x, y);
/* Turn on IGA2 now that mode setting is done. */
viaIGA2DisplayOutput(pScrn, TRUE);
commit 91c4a07d2c839c3f378dd9c3dc2b2c340fb218c8
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Jun 4 08:00:34 2016 -0700
Setting X and Y origin within iga1_crtc_mode_set differently
iga1_crtc_mode_set function should not be calling iga1_crtc_set_origin
function directly, and instead equivalent functionality should be
implemented within iga1_crtc_mode_set function.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_display.c b/src/via_display.c
index 0bb710c..bebfd40 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -2641,7 +2641,8 @@ iga1_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
/* Turn on Screen */
ViaCrtcMask(hwp, 0x17, 0x80, 0x80);
- iga1_crtc_set_origin(crtc, crtc->x, crtc->y);
+ viaIGA1SetFBStartingAddress(crtc, x, y);
+ VIAVidAdjustFrame(pScrn, x, y);
/* Turn on IGA1 now that mode setting is done. */
viaIGA1DPMSControl(pScrn, 0x00);
commit f0a766353f0e2b6c83c5f6dd3adf52572787884f
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Jun 4 07:30:40 2016 -0700
Changing VIAInitialize3DEngine to viaInitialize3DEngine
This function is located inside via_ums.c.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_ums.c b/src/via_ums.c
index 3c8e292..f584986 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -533,7 +533,7 @@ viaInitialize2DEngine(ScrnInfoPtr pScrn)
}
static void
-VIAInitialize3DEngine(ScrnInfoPtr pScrn)
+viaInitialize3DEngine(ScrnInfoPtr pScrn)
{
VIAPtr pVia = VIAPTR(pScrn);
int i;
@@ -623,7 +623,7 @@ umsAccelInit(ScreenPtr pScreen)
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Initializing the 3D engine.\n"));
- VIAInitialize3DEngine(pScrn);
+ viaInitialize3DEngine(pScrn);
pVia->exa_sync_bo = drm_bo_alloc(pScrn, 32, 32, TTM_PL_FLAG_VRAM);
if (!pVia->exa_sync_bo)
commit 417e3125503b5d7c3c814740ec91eb2b66f4763e
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Jun 4 07:26:53 2016 -0700
Changing VIAInitialize2DEngine to viaInitialize2DEngine
This function is located inside via_ums.c.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_ums.c b/src/via_ums.c
index 7bb1bb0..3c8e292 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -474,7 +474,7 @@ viaDisableVQ(ScrnInfoPtr pScrn)
* current screen depth. Also enable the virtual queue.
*/
static void
-VIAInitialize2DEngine(ScrnInfoPtr pScrn)
+viaInitialize2DEngine(ScrnInfoPtr pScrn)
{
VIAPtr pVia = VIAPTR(pScrn);
ViaTwodContext *tdc = &pVia->td;
@@ -619,7 +619,7 @@ umsAccelInit(ScreenPtr pScreen)
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Initializing the 2D engine.\n"));
- VIAInitialize2DEngine(pScrn);
+ viaInitialize2DEngine(pScrn);
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Initializing the 3D engine.\n"));
commit 0a416399f8071d6043d3d5a6b5ab9129a0fcd808
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Jun 4 07:22:51 2016 -0700
Changing VIAMapFB to viaMapFB
This function is located inside via_ums.c.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_ums.c b/src/via_ums.c
index 2ef6e67..7bb1bb0 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -236,7 +236,7 @@ viaUnmapMMIO(ScrnInfoPtr pScrn)
}
static Bool
-VIAMapFB(ScrnInfoPtr pScrn)
+viaMapFB(ScrnInfoPtr pScrn)
{
VIAPtr pVia = VIAPTR(pScrn);
#ifdef HAVE_PCIACCESS
@@ -247,7 +247,7 @@ VIAMapFB(ScrnInfoPtr pScrn)
#endif
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered VIAMapFB.\n"));
+ "Entered viaMapFB.\n"));
#ifdef HAVE_PCIACCESS
if (pVia->Chipset == VIA_VX900) {
@@ -336,12 +336,12 @@ VIAMapFB(ScrnInfoPtr pScrn)
}
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting VIAMapFB.\n"));
+ "Exiting viaMapFB.\n"));
return TRUE;
fail:
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting VIAMapFB.\n"));
+ "Exiting viaMapFB.\n"));
return FALSE;
}
@@ -871,7 +871,7 @@ umsPreInit(ScrnInfoPtr pScrn)
if (!viaMapMMIO(pScrn))
return FALSE;
- if (!VIAMapFB(pScrn))
+ if (!viaMapFB(pScrn))
return FALSE;
return TRUE;
}
commit 2797ae3d355b978957d8c2d7bc23d01028283b54
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Jun 4 06:48:00 2016 -0700
Changing ViaMMIODisable to viaMMIODisable
This function is located inside via_ums.c.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_ums.c b/src/via_ums.c
index 1ceecf3..2ef6e67 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -60,13 +60,13 @@ viaMMIOEnable(ScrnInfoPtr pScrn)
}
static void
-ViaMMIODisable(ScrnInfoPtr pScrn)
+viaMMIODisable(ScrnInfoPtr pScrn)
{
VIAPtr pVia = VIAPTR(pScrn);
vgaHWPtr hwp = VGAHWPTR(pScrn);
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered ViaMMIODisable.\n"));
+ "Entered viaMMIODisable.\n"));
switch (pVia->Chipset) {
case VIA_CX700:
@@ -83,7 +83,7 @@ ViaMMIODisable(ScrnInfoPtr pScrn)
}
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting ViaMMIODisable.\n"));
+ "Exiting viaMMIODisable.\n"));
}
static Bool
@@ -203,7 +203,7 @@ viaUnmapMMIO(ScrnInfoPtr pScrn)
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered viaUnmapMMIO.\n"));
- ViaMMIODisable(pScrn);
+ viaMMIODisable(pScrn);
#ifdef HAVE_PCIACCESS
if (pVia->MapBase)
commit 9e61c4ea94599d9f79777007b377f7fedb484c3d
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Jun 4 06:42:36 2016 -0700
Changing ViaMMIOEnable to viaMMIOEnable
This function is located inside via_ums.c.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_ums.c b/src/via_ums.c
index 227e4a4..1ceecf3 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -30,13 +30,13 @@
#include "via_driver.h"
static void
-ViaMMIOEnable(ScrnInfoPtr pScrn)
+viaMMIOEnable(ScrnInfoPtr pScrn)
{
VIAPtr pVia = VIAPTR(pScrn);
vgaHWPtr hwp = VGAHWPTR(pScrn);
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered ViaMMIOEnable.\n"));
+ "Entered viaMMIOEnable.\n"));
switch (pVia->Chipset) {
case VIA_CX700:
@@ -56,7 +56,7 @@ ViaMMIOEnable(ScrnInfoPtr pScrn)
}
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting ViaMMIOEnable.\n"));
+ "Exiting viaMMIOEnable.\n"));
}
static void
@@ -178,7 +178,7 @@ viaMapMMIO(ScrnInfoPtr pScrn)
/* Unlock extended I/O space. */
ViaSeqMask(hwp, 0x10, 0x01, 0x01);
- ViaMMIOEnable(pScrn);
+ viaMMIOEnable(pScrn);
/* Unlock CRTC. */
ViaCrtcMask(hwp, 0x47, 0x00, 0x01);
commit 066b939155048d20b75dc8d064761f3637b44a03
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Jun 4 06:39:52 2016 -0700
Changing VIAUnmapMMIO to viaUnmapMMIO
This function is located inside via_ums.c.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_driver.c b/src/via_driver.c
index 2893abd..a27bd43 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -420,7 +420,7 @@ VIAFreeRec(ScrnInfoPtr pScrn)
if (pVia->VideoRegs)
free(pVia->VideoRegs);
- VIAUnmapMMIO(pScrn);
+ viaUnmapMMIO(pScrn);
free(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
diff --git a/src/via_ums.c b/src/via_ums.c
index e7cd89c..227e4a4 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -196,12 +196,12 @@ fail:
}
void
-VIAUnmapMMIO(ScrnInfoPtr pScrn)
+viaUnmapMMIO(ScrnInfoPtr pScrn)
{
VIAPtr pVia = VIAPTR(pScrn);
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered VIAUnmapMMIO.\n"));
+ "Entered viaUnmapMMIO.\n"));
ViaMMIODisable(pScrn);
@@ -232,7 +232,7 @@ VIAUnmapMMIO(ScrnInfoPtr pScrn)
#endif
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting VIAUnmapMMIO.\n"));
+ "Exiting viaUnmapMMIO.\n"));
}
static Bool
diff --git a/src/via_ums.h b/src/via_ums.h
index 8bf8cf9..11ff0f8 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -181,7 +181,7 @@ typedef struct _VIABIOSINFO {
} VIABIOSInfoRec, *VIABIOSInfoPtr;
/* via_ums.c */
-void VIAUnmapMMIO(ScrnInfoPtr pScrn);
+void viaUnmapMMIO(ScrnInfoPtr pScrn);
void viaDisableVQ(ScrnInfoPtr pScrn);
Bool umsAccelInit(ScreenPtr pScreen);
Bool umsCreate(ScrnInfoPtr pScrn);
commit 0949cc344e50c6b2d79a436d8962e339b762ec85
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Jun 4 06:17:22 2016 -0700
Changing VIAMapMMIO to viaMapMMIO
This function is located inside via_ums.c.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_ums.c b/src/via_ums.c
index 7473e45..e7cd89c 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -87,7 +87,7 @@ ViaMMIODisable(ScrnInfoPtr pScrn)
}
static Bool
-VIAMapMMIO(ScrnInfoPtr pScrn)
+viaMapMMIO(ScrnInfoPtr pScrn)
{
VIAPtr pVia = VIAPTR(pScrn);
vgaHWPtr hwp = VGAHWPTR(pScrn);
@@ -97,7 +97,7 @@ VIAMapMMIO(ScrnInfoPtr pScrn)
#endif
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered VIAMapMMIO.\n"));
+ "Entered viaMapMMIO.\n"));
#ifdef HAVE_PCIACCESS
pVia->MmioBase = pVia->PciInfo->regions[1].base_addr;
@@ -186,12 +186,12 @@ VIAMapMMIO(ScrnInfoPtr pScrn)
vgaHWGetIOBase(hwp);
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting VIAMapMMIO.\n"));
+ "Exiting viaMapMMIO.\n"));
return TRUE;
fail:
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting VIAMapMMIO.\n"));
+ "Exiting viaMapMMIO.\n"));
return FALSE;
}
@@ -868,7 +868,7 @@ umsPreInit(ScrnInfoPtr pScrn)
#endif
/* Detect the amount of installed RAM */
- if (!VIAMapMMIO(pScrn))
+ if (!viaMapMMIO(pScrn))
return FALSE;
if (!VIAMapFB(pScrn))
More information about the Openchrome-devel
mailing list