configure.ac | 6 +++++- src/savage_driver.c | 16 ++++++++++++++-- src/savage_driver.h | 2 ++ src/savage_hwmc.c | 1 - 4 files changed, 21 insertions(+), 4 deletions(-)
New commits: commit 36ab23a95fd8d46a1206a941278df8845d5765ba Author: Dave Airlie <[email protected]> Date: Thu Jul 30 12:04:29 2009 +1000 savage: bump for release 2.3.1 diff --git a/configure.ac b/configure.ac index b0af452..b2f22f6 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-savage], - 2.3.0, + 2.3.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-savage) commit ad0b7ba4618c09c1a9d5a6da6b12f42980b7450c Author: Dave Airlie <[email protected]> Date: Tue Jul 28 18:40:18 2009 +1000 savage: move abi check down for RAC diff --git a/src/savage_driver.c b/src/savage_driver.c index 1566b47..c909783 100644 --- a/src/savage_driver.c +++ b/src/savage_driver.c @@ -42,9 +42,6 @@ #include <unistd.h> #include <errno.h> -#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 -#include "xf86RAC.h" -#endif #include "shadowfb.h" #include "globals.h" @@ -63,6 +60,10 @@ #include "savage_bci.h" #include "savage_streams.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 +#include "xf86RAC.h" +#endif + #define TRANSPARENCY_KEY 0xff; #ifdef XF86DRI commit 21f6bf3e492d328b8c7003ffb0c9deec0113fb05 Author: Dave Airlie <[email protected]> Date: Tue Jul 28 15:22:41 2009 +1000 savage: change to using ABI version check diff --git a/src/savage_driver.c b/src/savage_driver.c index e49c8c2..1566b47 100644 --- a/src/savage_driver.c +++ b/src/savage_driver.c @@ -42,7 +42,7 @@ #include <unistd.h> #include <errno.h> -#ifndef XSERVER_LIBPCIACCESS +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86RAC.h" #endif #include "shadowfb.h" diff --git a/src/savage_driver.h b/src/savage_driver.h index 34dfced..9c0ba58 100644 --- a/src/savage_driver.h +++ b/src/savage_driver.h @@ -51,7 +51,7 @@ #include "compiler.h" #include "vgaHW.h" #include "xf86.h" -#ifndef XSERVER_LIBPCIACCESS +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" #endif #include "xf86Pci.h" commit 3c0b164ffe9e1f582cee43f89a94fc0a2899bed8 Author: Dave Airlie <[email protected]> Date: Tue Jul 28 13:32:36 2009 +1000 savage: update for resources/RAC API removal diff --git a/src/savage_driver.c b/src/savage_driver.c index 3ce0d73..e49c8c2 100644 --- a/src/savage_driver.c +++ b/src/savage_driver.c @@ -42,7 +42,9 @@ #include <unistd.h> #include <errno.h> +#ifndef XSERVER_LIBPCIACCESS #include "xf86RAC.h" +#endif #include "shadowfb.h" #include "globals.h" @@ -680,7 +682,7 @@ static Bool SavagePciProbe(DriverPtr drv, int entity_num, } pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, - RES_SHARED_VGA, NULL, NULL, NULL, NULL); + NULL, NULL, NULL, NULL, NULL); if (pScrn != NULL) { EntityInfoPtr pEnt; SavagePtr psav; @@ -1393,20 +1395,24 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) } pEnt = xf86GetEntityInfo(pScrn->entityList[0]); +#ifndef XSERVER_LIBPCIACCESS if (pEnt->resources) { xfree(pEnt); SavageFreeRec(pScrn); return FALSE; } +#endif psav->EntityIndex = pEnt->index; if (xf86LoadSubModule(pScrn, "vbe")) { psav->pVbe = VBEInit(NULL, pEnt->index); } +#ifndef XSERVER_LIBPCIACCESS xf86RegisterResources(pEnt->index, NULL, ResNone); xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr); xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr); +#endif from = X_DEFAULT; if (pEnt->device->chipset && *pEnt->device->chipset) { diff --git a/src/savage_driver.h b/src/savage_driver.h index c47b472..34dfced 100644 --- a/src/savage_driver.h +++ b/src/savage_driver.h @@ -51,7 +51,9 @@ #include "compiler.h" #include "vgaHW.h" #include "xf86.h" +#ifndef XSERVER_LIBPCIACCESS #include "xf86Resources.h" +#endif #include "xf86Pci.h" #include "xf86PciInfo.h" #include "xf86_OSproc.h" diff --git a/src/savage_hwmc.c b/src/savage_hwmc.c index 43c9dfd..abfe805 100644 --- a/src/savage_hwmc.c +++ b/src/savage_hwmc.c @@ -28,7 +28,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" #include "compiler.h" #include "xf86PciInfo.h" #include "xf86Pci.h" commit 96d19b654e934fc3f85f9b45f1dee224cb40b389 Author: Peter Hutterer <[email protected]> Date: Thu Jul 16 11:54:48 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 33be4d8..b0af452 100644 --- a/configure.ac +++ b/configure.ac @@ -60,6 +60,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.1.0 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/savage_driver.c b/src/savage_driver.c index ec2083c..3ce0d73 100644 --- a/src/savage_driver.c +++ b/src/savage_driver.c @@ -46,8 +46,13 @@ #include "shadowfb.h" #include "globals.h" +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #include "xf86xv.h" -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
