Makefile.am | 2 +- configure.ac | 12 +++++++++++- src/g80_dac.c | 5 +++++ src/g80_driver.c | 14 +++++++++++++- src/g80_sor.c | 5 +++++ src/nv_driver.c | 4 ++++ src/nv_include.h | 6 ++++-- src/nv_video.c | 1 - src/riva_driver.c | 5 ++++- src/riva_include.h | 5 ++++- src/riva_type.h | 2 +- 11 files changed, 52 insertions(+), 9 deletions(-)
New commits: commit 0250f0d7ebe30368c5a63809ed1f58673493627c Author: Peter Hutterer <[email protected]> Date: Fri Sep 11 12:24:18 2009 +1000 nv 2.1.15 Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index 839512b..ce0b884 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-nv], - 2.1.14, + 2.1.15, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-nv) commit 5486e55c9feb5734b967c2618e0c96cd4a2322ce Author: Dave Airlie <[email protected]> Date: Tue Jul 28 18:37:42 2009 +1000 abi: fixup so the define is picked up diff --git a/src/g80_driver.c b/src/g80_driver.c index 9cc2bf2..13e417a 100644 --- a/src/g80_driver.c +++ b/src/g80_driver.c @@ -28,6 +28,7 @@ #include <string.h> +#include <xf86.h> #include <xf86_OSproc.h> #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include <xf86Resources.h> commit 85b5ff3fdf3141ef01604bd7eb8e71e30d24717f Author: Dave Airlie <[email protected]> Date: Tue Jul 28 15:22:40 2009 +1000 nv: change to using ABI version check diff --git a/src/g80_driver.c b/src/g80_driver.c index 17c85f0..9cc2bf2 100644 --- a/src/g80_driver.c +++ b/src/g80_driver.c @@ -29,7 +29,7 @@ #include <string.h> #include <xf86_OSproc.h> -#ifndef XSERVER_LIBPCIACCESS +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include <xf86Resources.h> #endif #include <mipointer.h> diff --git a/src/nv_include.h b/src/nv_include.h index 4442621..a0d5ad1 100644 --- a/src/nv_include.h +++ b/src/nv_include.h @@ -9,7 +9,7 @@ #include "xf86.h" #include "xf86_OSproc.h" -#ifndef XSERVER_LIBPCIACCESS +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" #include "xf86RAC.h" #endif diff --git a/src/riva_include.h b/src/riva_include.h index a2064e1..04c35a6 100644 --- a/src/riva_include.h +++ b/src/riva_include.h @@ -7,7 +7,7 @@ #include "xf86.h" #include "xf86_OSproc.h" -#ifndef XSERVER_LIBPCIACCESS +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" #include "xf86RAC.h" #endif commit 445498d2cc977b8c4f22fca881c75637dc7b058a Author: Dave Airlie <[email protected]> Date: Tue Jul 28 13:32:32 2009 +1000 nv: update for resources/RAC API removal diff --git a/src/g80_driver.c b/src/g80_driver.c index 7e06358..17c85f0 100644 --- a/src/g80_driver.c +++ b/src/g80_driver.c @@ -29,8 +29,9 @@ #include <string.h> #include <xf86_OSproc.h> +#ifndef XSERVER_LIBPCIACCESS #include <xf86Resources.h> -#include <xf86RandR12.h> +#endif #include <mipointer.h> #include <mibstore.h> #include <micmap.h> @@ -43,6 +44,7 @@ #include <X11/extensions/dpms.h> #endif +#include <xf86RandR12.h> #include "nv_const.h" #include "g80_type.h" @@ -229,8 +231,10 @@ G80PreInit(ScrnInfoPtr pScrn, int flags) } /* Disable VGA access */ +#ifndef XSERVER_LIBPCIACCESS xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr); xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr); +#endif pScrn->monitor = pScrn->confScreen->monitor; @@ -314,11 +318,13 @@ G80PreInit(ScrnInfoPtr pScrn, int flags) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "MMIO registers mapped at %p\n", (void*)pNv->reg); +#ifndef XSERVER_LIBPCIACCESS if(xf86RegisterResources(pEnt->index, NULL, ResExclusive)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "xf86RegisterResources() found " "resource conflicts\n"); goto fail; } +#endif pNv->architecture = pNv->reg[0] >> 20 & 0x1ff; tmp = pNv->reg[0x0010020C/4]; diff --git a/src/nv_driver.c b/src/nv_driver.c index 3a396e0..a7cf2dc 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -1264,8 +1264,10 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) #endif } +#ifndef XSERVER_LIBPCIACCESS xf86SetOperatingState(resVgaIo, pNv->pEnt->index, ResUnusedOpr); xf86SetOperatingState(resVgaMem, pNv->pEnt->index, ResDisableOpr); +#endif /* Set pScrn->monitor */ pScrn->monitor = pScrn->confScreen->monitor; @@ -1642,6 +1644,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX\n", (unsigned long)pNv->IOAddress); +#ifndef XSERVER_LIBPCIACCESS if (xf86RegisterResources(pNv->pEnt->index, NULL, ResExclusive)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "xf86RegisterResources() found resource conflicts\n"); @@ -1649,6 +1652,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) NVFreeRec(pScrn); return FALSE; } +#endif switch (pNv->Chipset & 0x0ff0) { case 0x0100: /* GeForce 256 */ diff --git a/src/nv_include.h b/src/nv_include.h index b579b37..4442621 100644 --- a/src/nv_include.h +++ b/src/nv_include.h @@ -8,7 +8,11 @@ /* All drivers should typically include these */ #include "xf86.h" #include "xf86_OSproc.h" + +#ifndef XSERVER_LIBPCIACCESS #include "xf86Resources.h" +#include "xf86RAC.h" +#endif #include "compiler.h" /* Drivers for PCI hardware need this */ @@ -29,8 +33,6 @@ #include "vbe.h" -#include "xf86RAC.h" - #include "nv_const.h" #include "dixstruct.h" diff --git a/src/nv_video.c b/src/nv_video.c index e11e0d0..6b13e5f 100644 --- a/src/nv_video.c +++ b/src/nv_video.c @@ -4,7 +4,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" #include "compiler.h" #include "xf86PciInfo.h" #include "xf86Pci.h" diff --git a/src/riva_driver.c b/src/riva_driver.c index 3540fe9..afe0972 100644 --- a/src/riva_driver.c +++ b/src/riva_driver.c @@ -396,8 +396,10 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags) #endif } +#ifndef XSERVER_LIBPCIACCESS xf86SetOperatingState(resVgaIo, pRiva->pEnt->index, ResUnusedOpr); xf86SetOperatingState(resVgaMem, pRiva->pEnt->index, ResDisableOpr); +#endif /* Set pScrn->monitor */ pScrn->monitor = pScrn->confScreen->monitor; @@ -633,6 +635,7 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags) xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX\n", (unsigned long)pRiva->IOAddress); +#ifndef XSERVER_LIBPCIACCESS if (xf86RegisterResources(pRiva->pEnt->index, NULL, ResExclusive)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "xf86RegisterResources() found resource conflicts\n"); @@ -640,7 +643,7 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags) RivaFreeRec(pScrn); return FALSE; } - +#endif Riva3Setup(pScrn); /* diff --git a/src/riva_include.h b/src/riva_include.h index 6726fcc..a2064e1 100644 --- a/src/riva_include.h +++ b/src/riva_include.h @@ -6,7 +6,11 @@ /* All drivers should typically include these */ #include "xf86.h" #include "xf86_OSproc.h" + +#ifndef XSERVER_LIBPCIACCESS #include "xf86Resources.h" +#include "xf86RAC.h" +#endif #include "compiler.h" /* Drivers for PCI hardware need this */ @@ -27,7 +31,6 @@ #include "vbe.h" -#include "xf86RAC.h" #include "riva_const.h" diff --git a/src/riva_type.h b/src/riva_type.h index 5a1317f..456f813 100644 --- a/src/riva_type.h +++ b/src/riva_type.h @@ -56,8 +56,8 @@ typedef struct { #else pciVideoPtr PciInfo; PCITAG PciTag; -#endif xf86AccessRec Access; +#endif int ChipRev; Bool Primary; CARD32 IOAddress; commit 957b8c1a240884b26ee5b91856c251622cc0b2a7 Author: Peter Hutterer <[email protected]> Date: Thu Jul 16 11:49:24 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 <[email protected]> diff --git a/configure.ac b/configure.ac index 3c874fe..839512b 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/g80_dac.c b/src/g80_dac.c index 404f178..307e412 100644 --- a/src/g80_dac.c +++ b/src/g80_dac.c @@ -27,8 +27,13 @@ #include <unistd.h> +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #include <xf86_OSproc.h> #include "g80_type.h" diff --git a/src/g80_driver.c b/src/g80_driver.c index 5ecf895..7e06358 100644 --- a/src/g80_driver.c +++ b/src/g80_driver.c @@ -36,8 +36,13 @@ #include <micmap.h> #include <xf86cmap.h> #include <fb.h> +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #include "nv_const.h" #include "g80_type.h" diff --git a/src/g80_sor.c b/src/g80_sor.c index c1ef42d..185761f 100644 --- a/src/g80_sor.c +++ b/src/g80_sor.c @@ -25,8 +25,13 @@ #include "config.h" #endif +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #include <X11/Xatom.h> #include "g80_type.h" commit e8d4dd85de02c689d3e0cc86a99aae6e61a7d17e Author: Gaetan Nadon <[email protected]> Date: Thu Jul 9 14:07:09 2009 -0400 xf86-video-nv: 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 Signed-off-by: Gaetan Nadon <[email protected]> Signed-off-by: Peter Hutterer <[email protected]> diff --git a/Makefile.am b/Makefile.am index cdce83e..0891338 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,6 +27,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 e67a1ef..3c874fe 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,11 @@ AC_INIT([xf86-video-nv], AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) + +# Require xorg-macros: XORG_RELEASE_VERSION 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) + AC_CONFIG_AUX_DIR(.) AM_INIT_AUTOMAKE([dist-bzip2]) @@ -129,6 +134,7 @@ AC_SUBST([DRIVER_NAME]) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([ Makefile -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
