xserver-xorg-video-r128: Changes to 'upstream-unstable'

 Makefile.am       |    2 +-
 configure.ac      |   11 ++++++++++-
 src/r128_driver.c |   21 +++++++++++++++++++++
 src/r128_probe.c  |    4 ++++
 4 files changed, 36 insertions(+), 2 deletions(-)

New commits:
commit 39dac77d3f2b5d69f13dc3aff17a4a245462fcc0
Author: Dave Airlie <airlied@xxxxxxxxxx>
Date:   Thu Jul 30 12:04:28 2009 +1000

    r128: bump for release 6.8.1

diff --git a/configure.ac b/configure.ac
index 1342662..4e0f463 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-r128],
-        6.8.0,
+        6.8.1,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-r128)
 

commit d519ef9adca6e60bbafbc5649f1bafef43cebb4e
Author: Dave Airlie <airlied@xxxxxxxxxx>
Date:   Tue Jul 28 15:22:41 2009 +1000

    r128: change to using ABI version check

diff --git a/src/r128_driver.c b/src/r128_driver.c
index a4a5cea..d6448b6 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -87,7 +87,7 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86PciInfo.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86RAC.h"
 #include "xf86Resources.h"
 #endif
diff --git a/src/r128_probe.c b/src/r128_probe.c
index c61da4c..412da92 100644
--- a/src/r128_probe.c
+++ b/src/r128_probe.c
@@ -46,8 +46,12 @@
 #include "xf86.h"
 #include "xf86PciInfo.h"
 
-#ifndef XSERVER_LIBPCIACCESS
+
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
+#endif
+
+#ifndef XSERVER_LIBPCIACCESS
 static Bool R128Probe(DriverPtr drv, int flags);
 #endif
 

commit e3568b4e5d404076c0f02c1b64af35c8e6d5745f
Author: Dave Airlie <airlied@xxxxxxxxxx>
Date:   Tue Jul 28 13:32:32 2009 +1000

    r128: update for resources/RAC API removal

diff --git a/src/r128_driver.c b/src/r128_driver.c
index 90e2246..a4a5cea 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -87,8 +87,10 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86PciInfo.h"
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86RAC.h"
 #include "xf86Resources.h"
+#endif
 #include "xf86cmap.h"
 #include "xf86xv.h"
 #include "vbe.h"
@@ -1980,10 +1982,12 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags)
               PCI_DEV_DEV(info->PciInfo),
               PCI_DEV_FUNC(info->PciInfo));
 
+#ifndef XSERVER_LIBPCIACCESS
     if (xf86RegisterResources(info->pEnt->index, 0, ResNone)) goto fail;
     if (xf86SetOperatingState(resVga, info->pEnt->index, ResUnusedOpr)) goto 
fail;
 
     pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_VIEWPORT | RAC_CURSOR;
+#endif
     pScrn->monitor     = pScrn->confScreen->monitor;
 
     if (!R128PreInitVisual(pScrn))    goto fail;
diff --git a/src/r128_probe.c b/src/r128_probe.c
index bfec1eb..c61da4c 100644
--- a/src/r128_probe.c
+++ b/src/r128_probe.c
@@ -45,9 +45,9 @@
 
 #include "xf86.h"
 #include "xf86PciInfo.h"
-#include "xf86Resources.h"
 
 #ifndef XSERVER_LIBPCIACCESS
+#include "xf86Resources.h"
 static Bool R128Probe(DriverPtr drv, int flags);
 #endif
 

commit 38d301388cfa1f228a6fa0cddf5b7ad6258154d2
Author: Gaetan Nadon <memsize@xxxxxxxxxxxx>
Date:   Wed Jul 15 15:44:01 2009 -0400

    Use XORG_CHANGELOG macro to create ChangeLog. #22611
    
    Adding the macro in configure.ac and use it in Makefile.am
        Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611
        Global maintenance on all modules
    
    Signed-off-by: Peter Hutterer <peter.hutterer@xxxxxxxxx>

diff --git a/Makefile.am b/Makefile.am
index c8dcab8..1f4c3c4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,6 +33,6 @@ CLEANFILES = ChangeLog
 .PHONY: ChangeLog
 
 ChangeLog:
-       (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv 
.changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git 
directory not found: installing possibly empty changelog.' >&2)
+       $(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 0d1f125..1342662 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,10 @@ AC_CONFIG_AUX_DIR(.)
 
 AM_INIT_AUTOMAKE([dist-bzip2])
 
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or 
later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+
 AM_MAINTAINER_MODE
 
 # Checks for programs.
@@ -132,6 +136,7 @@ AC_SUBST([DRIVER_NAME])
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
 XORG_CHECK_LINUXDOC
+XORG_CHANGELOG
 
 AC_MSG_NOTICE(
 [Please change the Driver line in xorg.conf from "ati" to "r128" or install]

commit 178e6f509bb8b351cfa01425ada7331781843954
Author: Peter Hutterer <peter.hutterer@xxxxxxxxx>
Date:   Thu Jul 16 11:51:08 2009 +1000

    Update to xextproto 7.1 support.
    
    DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
    need to include dpmsconst.h if xextproto 7.1 is available.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@xxxxxxxxx>

diff --git a/configure.ac b/configure.ac
index eed1586..0d1f125 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto 
$REQUIRED_MODULES])
+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+                  HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, 
[xextproto 7.1 available]),
+                  HAVE_XEXTPROTO_71="no")
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
diff --git a/src/r128_driver.c b/src/r128_driver.c
index f42acb6..90e2246 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -101,8 +101,13 @@
 #include "dixstruct.h"
 
                                /* DPMS support. */
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
+#endif
+
 
 #ifndef MAX
 #define MAX(a,b) ((a)>(b)?(a):(b))

commit 5d8a8df3aca2f14366946e48df9b674d7254ce04
Author: Matthieu Herrb <matthieu.herrb@xxxxxxx>
Date:   Sat Jun 13 19:20:24 2009 +0200

    Don't de-reference a NULL pointer in R128FreeScreen in the error path.
    
    If R128PreInit() failed, R128FreeRec() was already called and info
    will be NULL.

diff --git a/src/r128_driver.c b/src/r128_driver.c
index e3d7bb3..f42acb6 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -4337,6 +4337,8 @@ void R128FreeScreen(int scrnIndex, int flags)
     R128InfoPtr   info      = R128PTR(pScrn);
 
     R128TRACE(("R128FreeScreen\n"));
+    if (info == NULL)
+       return;
 #ifdef WITH_VGAHW
     if (info->VGAAccess && xf86LoaderCheckSymbol("vgaHWFreeHWRec"))
        vgaHWFreeHWRec(pScrn);

commit 771c707eb2bba21b6013327bb62859c37be08673
Author: John Nielsen <lists@xxxxxxxxxxxx>
Date:   Fri Apr 17 16:16:57 2009 -0400

    R128: fix zaphod dualhead after libpciaccess switch
    
    fixes bug 21251

diff --git a/src/r128_driver.c b/src/r128_driver.c
index 8f360a1..e3d7bb3 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -234,6 +234,16 @@ static Bool R128MapMMIO(ScrnInfoPtr pScrn)
     if (info->FBDev) {
        info->MMIO = fbdevHWMapMMIO(pScrn);
     } else {
+        /* If the primary screen has already mapped the MMIO region,
+           use its pointer instead of mapping it a second time. */
+        if (info->IsSecondary) {
+            DevUnion* pPriv = xf86GetEntityPrivate(pScrn->entityList[0], 
+                                                   getR128EntityIndex());
+            R128EntPtr pR128Ent = pPriv->ptr;
+            R128InfoPtr info0 = R128PTR(pR128Ent->pPrimaryScrn);
+            info->MMIO=info0->MMIO;
+            if (info->MMIO) return TRUE;
+        }
 #ifndef XSERVER_LIBPCIACCESS
        info->MMIO = xf86MapPciMem(pScrn->scrnIndex,
                                   VIDMEM_MMIO | VIDMEM_READSIDEEFFECT,


-- 
To UNSUBSCRIBE, email to debian-x-REQUEST@xxxxxxxxxxxxxxxx
with a subject of "unsubscribe". Trouble? Contact listmaster@xxxxxxxxxxxxxxxx