xserver-xorg-video-apm: Changes to 'upstream-unstable'
configure.ac | 6 ++
man/apm.man | 2
src/apm_driver.c | 131 ++++---------------------------------------------------
3 files changed, 17 insertions(+), 122 deletions(-)
New commits:
commit ec3e90e90b6e1c30122056466593bc53496773b4
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 30 11:20:31 2009 +1000
apm: bump for 1.2.2 release
diff --git a/configure.ac b/configure.ac
index 5d76327..d082040 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-apm],
- 1.2.1,
+ 1.2.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-apm)
commit 457f84f373b33838355dbb059892c118bed51409
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 30 11:19:35 2009 +1000
apm: fix up ABI properly
diff --git a/src/apm_driver.c b/src/apm_driver.c
index 3939dac..8dc3b3e 100644
--- a/src/apm_driver.c
+++ b/src/apm_driver.c
@@ -6,6 +6,10 @@
#include "apm.h"
#include "xf86cmap.h"
#include "shadowfb.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+#include "xf86Resources.h"
+#include "xf86RAC.h"
+#endif
#include "xf86int10.h"
#include "vbe.h"
@@ -786,6 +790,15 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
xf86FreeInt10(ptr);
}
+#ifndef XSERVER_LIBPCIACCESS
+ xf86RegisterResources(pEnt->index, NULL, ResNone);
+ xf86SetOperatingState(resVga, pEnt->index, ResDisableOpr);
+ pScrn->racMemFlags = 0; /* For noLinear, access to 0xA0000 */
+ if (pApm->VGAMap)
+ pScrn->racIoFlags = 0;
+ else
+ pScrn->racIoFlags = RAC_COLORMAP | RAC_VIEWPORT;
+#endif
if (pEnt->device->videoRam != 0) {
pScrn->videoRam = pEnt->device->videoRam;
from = X_CONFIG;
commit c2d90960dcd57b1380266188ca7155e981b50bb9
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:28 2009 +1000
apm: update for resources/RAC API removal
diff --git a/src/apm_driver.c b/src/apm_driver.c
index f9420a3..3939dac 100644
--- a/src/apm_driver.c
+++ b/src/apm_driver.c
@@ -6,9 +6,7 @@
#include "apm.h"
#include "xf86cmap.h"
#include "shadowfb.h"
-#include "xf86Resources.h"
#include "xf86int10.h"
-#include "xf86RAC.h"
#include "vbe.h"
#include "opaque.h"
@@ -788,14 +786,6 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
xf86FreeInt10(ptr);
}
- xf86RegisterResources(pEnt->index, NULL, ResNone);
- xf86SetOperatingState(resVga, pEnt->index, ResDisableOpr);
- pScrn->racMemFlags = 0; /* For noLinear, access to 0xA0000 */
- if (pApm->VGAMap)
- pScrn->racIoFlags = 0;
- else
- pScrn->racIoFlags = RAC_COLORMAP | RAC_VIEWPORT;
-
if (pEnt->device->videoRam != 0) {
pScrn->videoRam = pEnt->device->videoRam;
from = X_CONFIG;
commit 09347dfc78b7f291313057863976bf4b679362d1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 16 11:26:14 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 b15f61e..5d76327 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)
PKG_CHECK_MODULES(XF86RUSH, xxf86rush, have_xf86rush=yes, have_xf86rush=no)
diff --git a/src/apm_driver.c b/src/apm_driver.c
index 98c02d1..f9420a3 100644
--- a/src/apm_driver.c
+++ b/src/apm_driver.c
@@ -12,8 +12,13 @@
#include "vbe.h"
#include "opaque.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
+#endif
+
#define APM_VERSION 4000
#define APM_NAME "APM"
commit f985346aef9c15eaa1669ab8317e5e470eb143dc
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 28 14:41:37 2009 -0400
Remove useless loader symbol lists.
diff --git a/src/apm_driver.c b/src/apm_driver.c
index 0166f41..98c02d1 100644
--- a/src/apm_driver.c
+++ b/src/apm_driver.c
@@ -134,102 +134,6 @@ static const OptionInfoRec ApmOptions[] =
{0}, FALSE}
};
-/*
- * List of symbols from other modules that this module references. This
- * list is used to tell the loader that it is OK for symbols here to be
- * unresolved providing that it hasn't been told that they haven't been
- * told that they are essential via a call to xf86LoaderReqSymbols() or
- * xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about
- * unresolved symbols that are not required.
- */
-
-static const char *vgahwSymbols[] = {
- "vgaHWBlankScreen",
- "vgaHWCursor",
- "vgaHWFreeHWRec",
- "vgaHWGetHWRec",
- "vgaHWGetIOBase",
- "vgaHWInit",
- "vgaHWLock",
- "vgaHWMapMem",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWSetMmioFuncs",
- "vgaHWUnlock",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAACursorInfoRec",
- "XAACursorInit",
- "XAADestroyInfoRec",
- "XAAGlyphScanlineFuncLSBFirst",
- "XAAInit",
- "XAAReverseBitOrder",
- "XAAStippleScanlineFuncMSBFirst",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-#ifdef XFree86LOADER
-static const char *vbeSymbols[] = {
- "VBEInit",
- "vbeDoEDID",
- "vbeFree",
- NULL
-};
-#endif
-
-static const char *ddcSymbols[] = {
- "xf86DoEDID_DDC1",
- "xf86DoEDID_DDC2",
- "xf86PrintEDID",
- NULL
-};
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
-#ifdef XFree86LOADER
-static const char *miscfbSymbols[] = {
-#ifdef HAVE_XF1BPP
- "xf1bppScreenInit",
-#endif
-#ifdef HAVE_XF4BPP
- "xf4bppScreenInit",
-#endif
- NULL
-};
-#endif
-
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-static const char *int10Symbols[] = {
- "xf86Free10",
- "xf86InitInt10",
- NULL
-};
-
#ifdef XFree86LOADER
static XF86ModuleVersionInfo apmVersRec = {
@@ -262,11 +166,6 @@ apmSetup(pointer module, pointer opts, int *errmaj, int *errmain)
setupDone = TRUE;
xf86AddDriver(&APM, module, 0);
- LoaderRefSymLists(vgahwSymbols, fbSymbols, xaaSymbols,
- miscfbSymbols, ramdacSymbols, vbeSymbols,
- ddcSymbols, i2cSymbols, shadowSymbols,
- int10Symbols, NULL);
-
return (pointer)1;
}
else {
@@ -584,8 +483,6 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
-
/*
* Allocate a vgaHWRec
*/
@@ -854,9 +751,7 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
(unsigned long)pApm->LinAddress);
if (xf86LoadSubModule(pScrn, "ddc")) {
- xf86LoaderReqSymLists(ddcSymbols, NULL);
if (xf86LoadSubModule(pScrn, "i2c")) {
- xf86LoaderReqSymLists(i2cSymbols, NULL);
pApm->I2C = TRUE;
}
}
@@ -882,7 +777,6 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
if (xf86LoadSubModule(pScrn, "int10")) {
void *ptr;
- xf86LoaderReqSymLists(int10Symbols, NULL);
xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n");
ptr = xf86InitInt10(pEnt->index);
if (ptr)
@@ -1195,21 +1089,12 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
}
- if (mod) {
- if (req) {
- xf86LoaderReqSymbols(req, NULL);
- } else {
- xf86LoaderReqSymLists(fbSymbols, NULL);
- }
- }
-
/* Load XAA if needed */
if (!pApm->NoAccel) {
if (!xf86LoadSubModule(pScrn, "xaa")) {
ApmFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
/* Load ramdac if needed */
@@ -1218,7 +1103,6 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
ApmFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
/* Load shadowfb if needed */
@@ -1227,7 +1111,6 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
ApmFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
}
pApm->CurrentLayout.displayWidth = pScrn->virtualX;
commit c2f0cf8d34cb4a8838586bc93b9166415e9277d7
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 25 19:39:27 2009 +0100
Typo fix
This was introduced in "xf1/4 bpp conversion"
(commit 5e0510dd0144c8ee85b2bd8bde58ae212f0d8453)
diff --git a/src/apm_driver.c b/src/apm_driver.c
index cbb2f43..0166f41 100644
--- a/src/apm_driver.c
+++ b/src/apm_driver.c
@@ -1176,7 +1176,7 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
req = "xf1bppScreenInit";
break;
#endif
-#ifndef HAVE_XF4BPP
+#ifdef HAVE_XF4BPP
case 4:
mod = "xf4bpp";
req = "xf4bppScreenInit";
commit fb0378635d5840152716bd6834148012fee90e00
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 9 16:25:17 2009 -0800
Remove xorgconfig & xorgcfg from See Also list in man page
diff --git a/man/apm.man b/man/apm.man
index 739c658..62535fc 100644
--- a/man/apm.man
+++ b/man/apm.man
@@ -101,6 +101,6 @@ Force the software cursor. Default: off.
.BI "Option \*qShadowFB\*q \*q" boolean \*q
Enable or disable use of the shadow framebuffer layer. Default: off.
.SH "SEE ALSO"
-__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors include: ...
Reply to: