xserver-xorg-video-neomagic: Changes to 'upstream-unstable'
configure.ac | 2 +-
src/neo_driver.c | 22 +++++++++++++++++++---
2 files changed, 20 insertions(+), 4 deletions(-)
New commits:
commit f0a61bc00011b0497edc79cf6fa11ae88a227df9
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 11:48:52 2015 +0200
Bump to 1.2.9
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/configure.ac b/configure.ac
index dce0d93..c860d95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-neomagic],
- [1.2.8],
+ [1.2.9],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/Neomagic],
[xf86-video-neomagic])
AC_CONFIG_SRCDIR([Makefile.am])
commit b9399b8880e97af8b66d981ad3edd498e76d2e16
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 11:47:58 2015 +0200
Fix compiler warning with recent X servers
xf86GetOptValString was changed to return const char *.
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/neo_driver.c b/src/neo_driver.c
index da01962..62d6742 100644
--- a/src/neo_driver.c
+++ b/src/neo_driver.c
@@ -636,7 +636,7 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
int apertureSize;
Bool height_480 = FALSE;
Bool lcdCenterOptSet = FALSE;
- char *s;
+ const char *s;
if (flags & PROBE_DETECT) {
neoProbeDDC( pScrn, xf86GetEntityInfo(pScrn->entityList[0])->index );
commit 6661bdd4551e4e63e983685464a277845aed3012
Author: Dave Airlie <airlied@gmail.com>
Date: Sun Sep 21 09:51:37 2014 +1000
neomagic: fix build against master X server.
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/src/neo_driver.c b/src/neo_driver.c
index 1b0da34..da01962 100644
--- a/src/neo_driver.c
+++ b/src/neo_driver.c
@@ -1994,10 +1994,12 @@ neoMapMem(ScrnInfoPtr pScrn)
}
#endif
} else
+#ifdef VIDMEM_MMIO
nPtr->NeoMMIOBase =
xf86MapVidMem(pScrn->scrnIndex,
VIDMEM_MMIO, nPtr->NeoMMIOAddr,
0x200000L);
+#endif
if (nPtr->NeoMMIOBase == NULL)
return FALSE;
}
@@ -2024,10 +2026,12 @@ neoMapMem(ScrnInfoPtr pScrn)
}
#endif
else
+#ifdef VIDMEM_FRAMEBUFFER
nPtr->NeoFbBase =
xf86MapVidMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
(unsigned long)nPtr->NeoLinearAddr,
nPtr->NeoFbMapSize);
+#endif
if (nPtr->NeoFbBase == NULL)
return FALSE;
return TRUE;
commit 74a9a343f6e156d24539b81f1224b7410acf0e38
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 21 14:07:53 2014 -0400
Use own thunk functions instead of vgaHW*Weak
I plan to remove the Weak functions from a future server
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/neo_driver.c b/src/neo_driver.c
index 7e60f3e..1b0da34 100644
--- a/src/neo_driver.c
+++ b/src/neo_driver.c
@@ -1439,6 +1439,12 @@ NEOShadowInit(ScreenPtr pScreen)
return TRUE;
}
+static Bool
+NEOSaveScreen(ScreenPtr pScreen, int mode)
+{
+ return vgaHWSaveScreen(pScreen, mode);
+}
+
/* Mandatory */
static Bool
NEOScreenInit(SCREEN_INIT_ARGS_DECL)
@@ -1712,7 +1718,7 @@ NEOScreenInit(SCREEN_INIT_ARGS_DECL)
NEOInitVideo(pScreen);
- pScreen->SaveScreen = vgaHWSaveScreenWeak();
+ pScreen->SaveScreen = NEOSaveScreen;
/* Setup DPMS mode */
if (nPtr->NeoChipset != NM2070)
@@ -3049,6 +3055,12 @@ neo_ddc1Read(ScrnInfoPtr pScrn)
return (tmp);
}
+static void
+neo_ddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
+{
+ vgaHWddc1SetSpeed(pScrn, speed);
+}
+
static xf86MonPtr
neo_ddc1(ScrnInfoPtr pScrn)
{
@@ -3063,7 +3075,7 @@ neo_ddc1(ScrnInfoPtr pScrn)
VGAwCR(0x21,0x00);
VGAwCR(0x1D,0x01); /* some Voodoo */
VGAwGR(0xA1,0x2F);
- ret = xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),vgaHWddc1SetSpeedWeak(),neo_ddc1Read);
+ ret = xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),neo_ddc1SetSpeed,neo_ddc1Read);
/* undo initialization */
VGAwCR(0x21,reg1);
VGAwCR(0x1D,reg2);
Reply to: