configure.ac | 2 +-
src/via_ums.c | 42 ++++++++++++++++++++++++++++--------------
2 files changed, 29 insertions(+), 15 deletions(-)
New commits:
commit 79437a2929091ea3be522934e5eeb7d6757a3dd5
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Fri Apr 8 14:29:47 2016 -0700
Version bumped to 0.4.100
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/configure.ac b/configure.ac
index f80fd45..88409d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.4.99],
+ [0.4.100],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit bcedcdd2a0717ced1a7cb89d66f262245ab5340f
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Fri Apr 8 14:27:12 2016 -0700
Diagnostic message tweak of VIAMapMMIO
This function is located inside via_ums.c.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_ums.c b/src/via_ums.c
index 199e566..fc6b1a0 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -106,7 +106,7 @@ VIAMapMMIO(ScrnInfoPtr pScrn)
#endif
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
- "Mapping MMIO at address 0x%lx with size %x.\n",
+ "Mapping MMIO at address 0x%lx with size 0x%x.\n",
pVia->MmioBase, VIA_MMIO_REGSIZE);
#ifdef HAVE_PCIACCESS
@@ -135,7 +135,7 @@ VIAMapMMIO(ScrnInfoPtr pScrn)
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"Mapping 2D Host BitBLT space at address 0x%lx with "
- "size %x.\n",
+ "size 0x%x.\n",
pVia->MmioBase + VIA_MMIO_BLTBASE, VIA_MMIO_BLTSIZE);
#ifdef HAVE_PCIACCESS
commit 8f0ab029a10fa0c6e20a98b9974716ba18a7b2d9
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Fri Apr 8 14:17:52 2016 -0700
Code clean up of VIAMapFB
This function is located inside via_ums.c.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_ums.c b/src/via_ums.c
index 58dc7fb..199e566 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -241,6 +241,15 @@ static Bool
VIAMapFB(ScrnInfoPtr pScrn)
{
VIAPtr pVia = VIAPTR(pScrn);
+#ifdef HAVE_PCIACCESS
+ int err;
+#endif
+#ifndef HAVE_PCIACCESS
+ unsigned char *tmp;
+#endif
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Entered VIAMapFB.\n"));
#ifdef HAVE_PCIACCESS
if (pVia->Chipset == VIA_VX900) {
@@ -248,7 +257,6 @@ VIAMapFB(ScrnInfoPtr pScrn)
} else {
pVia->FrameBufferBase = pVia->PciInfo->regions[0].base_addr;
}
- int err;
#else
if (pVia->Chipset == VIA_VX900) {
pVia->FrameBufferBase = pVia->PciInfo->memBase[2];
@@ -257,21 +265,17 @@ VIAMapFB(ScrnInfoPtr pScrn)
}
#endif
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VIAMapFB\n"));
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
- "mapping framebuffer @ 0x%lx with size 0x%lx\n",
+ "Mapping a frame buffer at address 0x%lx with size 0x%lx.\n",
pVia->FrameBufferBase, pVia->videoRambytes);
if (pVia->videoRambytes) {
-
#ifndef HAVE_PCIACCESS
/*
* FIXME: This is a hack to get rid of offending wrongly sized
* MTRR regions set up by the VIA BIOS. Should be taken care of
* in the OS support layer.
*/
- unsigned char *tmp;
-
tmp = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO, pVia->PciTag,
pVia->FrameBufferBase, pVia->videoRambytes);
xf86UnMapVidMem(pScrn->scrnIndex, (pointer) tmp, pVia->videoRambytes);
@@ -298,8 +302,10 @@ VIAMapFB(ScrnInfoPtr pScrn)
(void **)&pVia->FBBase);
if (err) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "Unable to map mmio BAR. %s (%d)\n", strerror(err),
err);
- return FALSE;
+ "Unable to map a frame buffer.\n"
+ "Error: %s (%d)\n",
+ strerror(err), err);
+ goto fail;
}
#else
pVia->FBBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
@@ -308,8 +314,8 @@ VIAMapFB(ScrnInfoPtr pScrn)
if (!pVia->FBBase) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "Internal error: could not map framebuffer\n");
- return FALSE;
+ "Unable to map a frame buffer.\n");
+ goto fail;
}
#endif
@@ -317,7 +323,7 @@ VIAMapFB(ScrnInfoPtr pScrn)
pVia->FBFreeEnd = pVia->videoRambytes;
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
- "Frame buffer start: %p, free start: 0x%x end: 0x%x\n",
+ "Frame buffer start address: %p, free start: 0x%x end:
0x%x\n",
pVia->FBBase, pVia->FBFreeStart, pVia->FBFreeEnd);
}
@@ -327,10 +333,18 @@ VIAMapFB(ScrnInfoPtr pScrn)
pScrn->memPhysBase = pVia->PciInfo->memBase[0];
#endif
pScrn->fbOffset = 0;
- if (pVia->IsSecondary)
+ if (pVia->IsSecondary) {
pScrn->fbOffset = pScrn->videoRam << 10;
+ }
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Exiting VIAMapFB.\n"));
return TRUE;
+
+fail:
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Exiting VIAMapFB.\n"));
+ return FALSE;
}
/*
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
