xserver-xorg-video-s3virge: Changes to 'upstream-unstable'
configure.ac | 6 ++
src/s3v_driver.c | 134 +++++--------------------------------------------------
src/s3v_shadow.c | 1
3 files changed, 18 insertions(+), 123 deletions(-)
New commits:
commit 8abfc25662caf07911fd6e31d40b7db8b7c0cac1
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 30 12:04:28 2009 +1000
s3virge: bump for release 1.10.4
diff --git a/configure.ac b/configure.ac
index 03fa1a2..317b5bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-s3virge],
- 1.10.3,
+ 1.10.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-s3virge)
commit 7db324f9d862cb9e11db480a1e6143aa01a81e3e
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 30 11:09:01 2009 +1000
s3v: add include to ABI version
diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index 7fc66e0..0928a7f 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -30,6 +30,7 @@ in this Software without prior written authorization from the XFree86 Project.
#include <unistd.h>
+#include "xf86.h"
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
/* Needed by Resources Access Control (RAC) */
commit 20d8f38d667b565c56d8e161548fe7a70b8892f7
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:41 2009 +1000
s3virge: change to using ABI version check
diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index 849f9f2..7fc66e0 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -30,7 +30,7 @@ in this Software without prior written authorization from the XFree86 Project.
#include <unistd.h>
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
/* Needed by Resources Access Control (RAC) */
#include "xf86RAC.h"
commit 664d41155a5f60fa8ccf9c00d819d71d7fe0a238
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:36 2009 +1000
s3virge: update for resources/RAC API removal
diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index df5ea9b..849f9f2 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -29,9 +29,12 @@ in this Software without prior written authorization from the XFree86 Project.
#endif
#include <unistd.h>
+
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86Resources.h"
/* Needed by Resources Access Control (RAC) */
#include "xf86RAC.h"
+#endif
#include "xf86DDC.h"
#include "vbe.h"
@@ -791,11 +794,13 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
+#ifndef XSERVER_LIBPCIACCESS
if (pEnt->resources) {
xfree(pEnt);
S3VFreeRec(pScrn);
return FALSE;
}
+#endif
#if USE_INT10
if (xf86LoadSubModule(pScrn, "int10")) {
@@ -812,9 +817,11 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
}
ps3v->PciInfo = xf86GetPciInfoForEntity(pEnt->index);
+#ifndef XSERVER_LIBPCIACCESS
xf86RegisterResources(pEnt->index,NULL,ResNone);
xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr);
xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr);
+#endif
/*
* Set the Chipset and ChipRev, allowing config file entries to
diff --git a/src/s3v_shadow.c b/src/s3v_shadow.c
index f61773a..e2e1269 100644
--- a/src/s3v_shadow.c
+++ b/src/s3v_shadow.c
@@ -60,7 +60,6 @@ in this Software without prior written authorization from the XFree86 Project.
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "shadowfb.h"
commit c688ce43f935af22c23d58c692ffa501b88d9070
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 16 11:54:36 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@who-t.net>
diff --git a/configure.ac b/configure.ac
index a312ae1..03fa1a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,6 +55,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 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/s3v_driver.c b/src/s3v_driver.c
index 61e2273..df5ea9b 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -58,8 +58,13 @@ in this Software without prior written authorization from the XFree86 Project.
#include "globals.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
+#endif
+
#ifndef USE_INT10
#define USE_INT10 0
commit 15a028c2a3a57198f5b64a8ca56ba075cc834768
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 2 11:36:57 2009 -0400
s3virge 1.10.3
diff --git a/configure.ac b/configure.ac
index 1ac7860..a312ae1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-s3virge],
- 1.10.2,
+ 1.10.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-s3virge)
commit 4f3456b10b67f40a793609c7d25ec355d95fa83e
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 28 15:15:15 2009 -0400
Remove useless loader symbol lists.
diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index 0f605df..61e2273 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -252,101 +252,6 @@ static const OptionInfoRec S3VOptions[] =
{-1, NULL, OPTV_NONE, {0}, FALSE}
};
-
-/*
- * Lists of symbols that may/may not be required by this driver.
- * This allows the loader to know which ones to issue warnings for.
- *
- * Note that vgahwSymbols and xaaSymbols are referenced outside the
- * XFree86LOADER define in later code, so are defined outside of that
- * define here also.
- */
-
-static const char *vgahwSymbols[] = {
- "vgaHWBlankScreen",
- "vgaHWCopyReg",
- "vgaHWGetHWRec",
- "vgaHWGetIOBase",
- "vgaHWGetIndex",
- "vgaHWInit",
- "vgaHWLock",
- "vgaHWMapMem",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWSaveScreen",
- "vgaHWSetMmioFuncs",
- "vgaHWSetStdFuncs",
- "vgaHWUnmapMem",
- "vgaHWddc1SetSpeedWeak",
- /* not used by ViRGE (at the moment :( ) */
- /*
- "vgaHWUnlock",
- "vgaHWFreeHWRec",
- */
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAAGetCopyROP",
- "XAAGetCopyROP_PM",
- "XAADestroyInfoRec",
- "XAACreateInfoRec",
- "XAAHelpPatternROP",
- "XAAHelpSolidROP",
- "XAAInit",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86InitCursor",
-#if 0
- "xf86DestroyCursorInfoRec",
-#endif
- NULL
-};
-
-static const char *ddcSymbols[] = {
- "xf86PrintEDID",
- "xf86DoEDID_DDC1",
- "xf86DoEDID_DDC2",
- "xf86SetDDCproperties",
- NULL
-};
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
-static const char *vbeSymbols[] = {
- "VBEInit",
- "vbeDoEDID",
- "vbeFree",
- NULL
-};
-
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-#if USE_INT10
-static const char *int10Symbols[] = {
- "xf86InitInt10",
- "xf86FreeInt10",
- NULL
-};
-#endif
-
#ifdef XFree86LOADER
static MODULESETUPPROTO(s3virgeSetup);
@@ -387,22 +292,6 @@ s3virgeSetup(pointer module, pointer opts, int *errmaj, int *errmin)
xf86AddDriver(&S3VIRGE, module, 0);
/*
- * Modules that this driver always requires can be loaded here
- * by calling LoadSubModule().
- */
-
- /*
- * Tell the loader about symbols from other modules that this module
- * might refer to.
- */
- LoaderRefSymLists(vgahwSymbols, xaaSymbols, ramdacSymbols,
- ddcSymbols, i2cSymbols,
-#if USE_INT10
- int10Symbols,
-#endif
- vbeSymbols, shadowSymbols, fbSymbols, NULL);
-
- /*
* The return value must be non-NULL on success even though there
* is no TearDownProc.
*/
@@ -616,8 +505,6 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
-
/*
* Allocate a vgaHWRec
*/
@@ -908,7 +795,6 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
#if USE_INT10
if (xf86LoadSubModule(pScrn, "int10")) {
xf86Int10InfoPtr pInt;
- xf86LoaderReqSymLists(int10Symbols, NULL);
#if 1
xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n");
pInt = xf86InitInt10(pEnt->index);
@@ -917,7 +803,6 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
}
#endif
if (xf86LoadSubModule(pScrn, "vbe")) {
- xf86LoaderReqSymLists(vbeSymbols, NULL);
ps3v->pVbe = VBEInit(NULL,pEnt->index);
}
@@ -1032,7 +917,6 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
if (xf86LoadSubModule(pScrn, "ddc")) {
xf86MonPtr pMon = NULL;
- xf86LoaderReqSymLists(ddcSymbols, NULL);
if ((ps3v->pVbe)
&& ((pMon = xf86PrintEDID(vbeDoEDID(ps3v->pVbe, NULL))) != NULL))
xf86SetDDCproperties(pScrn,pMon);
@@ -1427,7 +1311,6 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
S3VFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
/* Load XAA if needed */
if (!ps3v->NoAccel || ps3v->hwcursor ) {
@@ -1435,7 +1318,6 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
S3VFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
/* Load ramdac if needed */
@@ -1444,7 +1326,6 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
S3VFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
if (ps3v->shadowFB) {
@@ -1452,7 +1333,6 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
S3VFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
}
/* Setup WAITFIFO() for accel and ModeInit() */
@@ -3890,7 +3770,6 @@ S3Vddc2(int scrnIndex)
S3VPtr ps3v = S3VPTR(pScrn);
if ( xf86LoadSubModule(pScrn, "i2c") ) {
- xf86LoaderReqSymLists(i2cSymbols,NULL);
if (S3V_I2CInit(pScrn)) {
CARD32 tmp = (INREG(DDC_REG));
OUTREG(DDC_REG,(tmp | 0x13));
Reply to: