xserver-xorg-video-tga: Changes to 'upstream-unstable'
configure.ac | 6 ++++-
src/tga_driver.c | 59 ++++++++++++-------------------------------------------
2 files changed, 18 insertions(+), 47 deletions(-)
New commits:
commit f8ab003b1bf36ee9bd336689f79c3f4f2801f7f4
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Sep 7 14:51:16 2009 +1000
bump to 1.2.1
diff --git a/configure.ac b/configure.ac
index 3ff2dfb..c357ab3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-tga],
- 1.2.0,
+ 1.2.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-tga)
commit 0922506f4c4627e4a0b6041c3569656e5314e937
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:41 2009 +1000
tga: change to using ABI version check
diff --git a/src/tga_driver.c b/src/tga_driver.c
index 069fdc6..5f7752b 100644
--- a/src/tga_driver.c
+++ b/src/tga_driver.c
@@ -38,7 +38,7 @@
#include "xf86PciInfo.h"
#include "xf86Pci.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#include "xf86RAC.h"
#endif
commit 2e5ad88716038229563e0682b2665f156aab0d33
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:39 2009 +1000
tga: update for resources/RAC API removal
diff --git a/src/tga_driver.c b/src/tga_driver.c
index 8615b29..069fdc6 100644
--- a/src/tga_driver.c
+++ b/src/tga_driver.c
@@ -38,9 +38,10 @@
#include "xf86PciInfo.h"
#include "xf86Pci.h"
-/* RAC stuff */
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86Resources.h"
-
+#include "xf86RAC.h"
+#endif
/* #include "vgaHW.h" */
/* software cursor */
@@ -54,9 +55,6 @@
#include "fb.h"
-/* more RAC stuff */
-#include "xf86RAC.h"
-
/* Gamma Correction? */
#include "xf86cmap.h"
@@ -471,7 +469,9 @@ TGAPreInit(ScrnInfoPtr pScrn, int flags)
/* This is the general case */
for (i = 0; i < pScrn->numEntities; i++) {
pTga->pEnt = xf86GetEntityInfo(pScrn->entityList[i]);
+#ifndef XSERVER_LIBPCIACCESS
if (pTga->pEnt->resources) return FALSE;
+#endif
pTga->Chipset = pTga->pEnt->chipset;
pScrn->chipset = (char *)xf86TokenToString(TGAChipsets,
pTga->pEnt->chipset);
@@ -765,6 +765,7 @@ TGAPreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX\n",
(unsigned long)pTga->IOAddress);
+#ifndef XSERVER_LIBPCIACCESS
/* RAC stuff: we don't have any resources we need to reserve,
but we should do this here anyway */
if (xf86RegisterResources(pTga->pEnt->index, NULL, ResExclusive)) {
@@ -773,8 +774,7 @@ TGAPreInit(ScrnInfoPtr pScrn, int flags)
TGAFreeRec(pScrn);
return FALSE;
}
-
-
+#endif
/* HW bpp matches reported bpp */
pTga->HwBpp = pScrn->bitsPerPixel;
commit 60a7cad2c07bd23f58de07e927d0abbadd5e3bc8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 16 11:57:07 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 b47a6d0..3ff2dfb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,10 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
# 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/tga_driver.c b/src/tga_driver.c
index c315d2e..8615b29 100644
--- a/src/tga_driver.c
+++ b/src/tga_driver.c
@@ -70,8 +70,13 @@
#endif
#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"
#include <X11/extensions/Xv.h>
commit a1de18228b0e6743f9615d820229a7b144f3f5ac
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 28 15:22:15 2009 -0400
Remove useless loader symbol lists.
diff --git a/src/tga_driver.c b/src/tga_driver.c
index 2158790..c315d2e 100644
--- a/src/tga_driver.c
+++ b/src/tga_driver.c
@@ -177,33 +177,6 @@ static RamDacSupportedInfoRec BTramdacs[] = {
{ -1 }
};
-static const char *ramdacSymbols[] = {
- "BTramdacProbe",
- "RamDacCreateInfoRec",
- "RamDacDestroyInfoRec",
- "RamDacFreeRec",
- "RamDacGetHWIndex",
- "RamDacHandleColormaps",
- "RamDacInit",
- "xf86CreateCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAGetGCIndex",
- "XAAInit",
- NULL
-};
-
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
#ifdef XFree86LOADER
static MODULESETUPPROTO(tgaSetup);
@@ -234,13 +207,6 @@ tgaSetup(pointer module, pointer opts, int *errmaj, int *errmin)
xf86AddDriver(&TGA, module, 0);
/*
- * Modules that this driver always requires can be loaded here
- * by calling LoadSubModule().
- */
-
- LoaderRefSymLists(ramdacSymbols, fbSymbols, xaaSymbols, NULL);
-
- /*
* The return value must be non-NULL on success even though there
* is no TearDownProc.
*/
@@ -480,8 +446,6 @@ TGAPreInit(ScrnInfoPtr pScrn, int flags)
if (!xf86LoadSubModule(pScrn, "ramdac"))
return FALSE;
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
-
/* Allocate the TGARec driverPrivate */
if (!TGAGetRec(pScrn)) {
return FALSE;
@@ -837,15 +801,12 @@ TGAPreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
-
/* Load XAA if needed */
if (!pTga->NoAccel || pTga->HWCursor) {
if (!xf86LoadSubModule(pScrn, "xaa")) {
TGAFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
commit 72e3e402ef00ff1ef910e6e0319b87182ae668b0
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 15 02:53:13 2009 +0200
Add unistd.h include for getpagesize() and usleep()
diff --git a/src/tga_driver.c b/src/tga_driver.c
index b3b26ae..2158790 100644
--- a/src/tga_driver.c
+++ b/src/tga_driver.c
@@ -28,6 +28,7 @@
#endif
#include <string.h>
+#include <unistd.h>
/* everybody includes these */
#include "xf86.h"
Reply to: