xserver-xorg-video-fbdev: Changes to 'upstream-unstable'
README | 20 ++++++++++++
configure.ac | 10 +++++-
man/fbdev.man | 2 -
src/fbdev.c | 96 +++++++++-------------------------------------------------
4 files changed, 46 insertions(+), 82 deletions(-)
New commits:
commit e233c12c97233f8842c77cb6324c19fcdb06bfa7
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 30 12:04:27 2009 +1000
fbdev: bump for release 0.4.1
diff --git a/configure.ac b/configure.ac
index 7e82996..f76cca0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-fbdev],
- 0.4.0,
+ 0.4.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-fbdev)
commit dfe51de9923c5436b039f246cf2fc4bfff9329e8
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:40 2009 +1000
fbdev: change to using ABI version check
diff --git a/src/fbdev.c b/src/fbdev.c
index 306d59c..0ba0743 100644
--- a/src/fbdev.c
+++ b/src/fbdev.c
@@ -27,7 +27,7 @@
#include "afb.h"
#endif
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#include "xf86RAC.h"
#endif
commit fe00991326bbf6f0944543fda3856bedaa916a09
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:29 2009 +1000
fbdev: update for resources/RAC API removal
diff --git a/src/fbdev.c b/src/fbdev.c
index 9e66095..306d59c 100644
--- a/src/fbdev.c
+++ b/src/fbdev.c
@@ -27,8 +27,10 @@
#include "afb.h"
#endif
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86Resources.h"
#include "xf86RAC.h"
+#endif
#include "fbdevhw.h"
@@ -413,6 +415,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
fPtr->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
+#ifndef XSERVER_LIBPCIACCESS
pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
/* XXX Is this right? Can probably remove RAC_FB */
pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
@@ -423,7 +426,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
"xf86RegisterResources() found resource conflicts\n");
return FALSE;
}
-
+#endif
/* open device */
if (!fbdevHWInit(pScrn,NULL,xf86FindOptionValue(fPtr->pEnt->device->options,"fbdev")))
return FALSE;
commit 16ea2bb46c9acc881f66a1f498d63586071aa9b7
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 28 14:55:08 2009 -0400
Remove useless loader symbol lists.
diff --git a/src/fbdev.c b/src/fbdev.c
index d37f149..9e66095 100644
--- a/src/fbdev.c
+++ b/src/fbdev.c
@@ -141,67 +141,6 @@ static const OptionInfoRec FBDevOptions[] = {
/* -------------------------------------------------------------------- */
-static const char *afbSymbols[] = {
- "afbScreenInit",
- "afbCreateDefColormap",
- NULL
-};
-
-static const char *fbSymbols[] = {
- "fbScreenInit",
- "fbPictureInit",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "shadowAdd",
- "shadowInit",
- "shadowSetup",
- "shadowUpdatePacked",
- "shadowUpdatePackedWeak",
- "shadowUpdateRotatePacked",
- "shadowUpdateRotatePackedWeak",
- NULL
-};
-
-static const char *fbdevHWSymbols[] = {
- "fbdevHWInit",
- "fbdevHWProbe",
- "fbdevHWSetVideoModes",
- "fbdevHWUseBuildinMode",
-
- "fbdevHWGetDepth",
- "fbdevHWGetLineLength",
- "fbdevHWGetName",
- "fbdevHWGetType",
- "fbdevHWGetVidmem",
- "fbdevHWLinearOffset",
- "fbdevHWLoadPalette",
- "fbdevHWMapVidmem",
- "fbdevHWUnmapVidmem",
-
- /* colormap */
- "fbdevHWLoadPalette",
- "fbdevHWLoadPaletteWeak",
-
- /* ScrnInfo hooks */
- "fbdevHWAdjustFrameWeak",
- "fbdevHWEnterVTWeak",
- "fbdevHWLeaveVTWeak",
- "fbdevHWModeInit",
- "fbdevHWRestore",
- "fbdevHWSave",
- "fbdevHWSaveScreen",
- "fbdevHWSaveScreenWeak",
- "fbdevHWSwitchModeWeak",
- "fbdevHWValidModeWeak",
-
- "fbdevHWDPMSSet",
- "fbdevHWDPMSSetWeak",
-
- NULL
-};
-
#ifdef XFree86LOADER
MODULESETUPPROTO(FBDevSetup);
@@ -230,8 +169,6 @@ FBDevSetup(pointer module, pointer opts, int *errmaj, int *errmin)
if (!setupDone) {
setupDone = TRUE;
xf86AddDriver(&FBDEV, module, HaveDriverFuncs);
- LoaderRefSymLists(afbSymbols, fbSymbols,
- shadowSymbols, fbdevHWSymbols, NULL);
return (pointer)1;
} else {
if (errmaj) *errmaj = LDR_ONCEONLY;
@@ -307,8 +244,6 @@ static Bool FBDevPciProbe(DriverPtr drv, int entity_num,
if (!xf86LoadDrvSubModule(drv, "fbdevhw"))
return FALSE;
- xf86LoaderReqSymLists(fbdevHWSymbols, NULL);
-
pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, NULL,
NULL, NULL, NULL, NULL);
if (pScrn) {
@@ -369,8 +304,6 @@ FBDevProbe(DriverPtr drv, int flags)
if (!xf86LoadDrvSubModule(drv, "fbdevhw"))
return FALSE;
- xf86LoaderReqSymLists(fbdevHWSymbols, NULL);
-
for (i = 0; i < numDevSections; i++) {
Bool isIsa = FALSE;
Bool isPci = FALSE;
@@ -463,7 +396,6 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
FBDevPtr fPtr;
int default_depth, fbbpp;
const char *mod = NULL, *s;
- const char **syms = NULL;
int type;
if (flags & PROBE_DETECT) return FALSE;
@@ -620,7 +552,6 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
{
case FBDEVHW_PLANES:
mod = "afb";
- syms = afbSymbols;
break;
case FBDEVHW_PACKED_PIXELS:
switch (pScrn->bitsPerPixel)
@@ -630,7 +561,6 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
case 24:
case 32:
mod = "fb";
- syms = fbSymbols;
break;
default:
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -666,9 +596,6 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
FBDevFreeRec(pScrn);
return FALSE;
}
- if (mod && syms) {
- xf86LoaderReqSymLists(syms, NULL);
- }
/* Load shadow if needed */
if (fPtr->shadowFB) {
@@ -678,7 +605,6 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
FBDevFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
}
TRACE_EXIT("PreInit");
commit c3434c86252428a93861daa8ba1161391576cd88
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 4 10:09:47 2009 -0500
Allow building against a non-DGA server.
diff --git a/src/fbdev.c b/src/fbdev.c
index 7f1a749..d37f149 100644
--- a/src/fbdev.c
+++ b/src/fbdev.c
@@ -1239,6 +1239,7 @@ FBDevDGAAddModes(ScrnInfoPtr pScrn)
static Bool
FBDevDGAInit(ScrnInfoPtr pScrn, ScreenPtr pScreen)
{
+#ifdef XFreeXDGA
FBDevPtr fPtr = FBDEVPTR(pScrn);
if (pScrn->depth < 8)
@@ -1249,6 +1250,9 @@ FBDevDGAInit(ScrnInfoPtr pScrn, ScreenPtr pScreen)
return (DGAInit(pScreen, &FBDevDGAFunctions,
fPtr->pDGAMode, fPtr->nDGAMode));
+#else
+ return TRUE;
+#endif
}
static Bool
commit db33e337a867c5be8f21c7ebf6fdafaa00d02abc
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 30 20:38:47 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
diff --git a/README b/README
new file mode 100644
index 0000000..20dc09a
--- /dev/null
+++ b/README
@@ -0,0 +1,20 @@
+xf86-video-fbdev - video driver for framebuffer device
+
+Please submit bugs & patches to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-fbdev
+
+ http://cgit.freedesktop.org/xorg/driver/xf86-video-fbdev
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
commit f9b88908fc94d03d91d948a67c0dc87d30f2a6a9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 9 16:27:44 2009 -0800
Remove xorgconfig & xorgcfg from See Also list in man page
diff --git a/man/fbdev.man b/man/fbdev.man
index aed60ce..536f40b 100644
--- a/man/fbdev.man
+++ b/man/fbdev.man
@@ -57,7 +57,7 @@ Enable rotation of the display. The supported values are "CW" (clockwise,
90 degrees), "UD" (upside down, 180 degrees) and "CCW" (counter clockwise,
270 degrees). Implies use of the shadow framebuffer layer. Default: off.
.SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__),
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__),
X(__miscmansuffix__), fbdevhw(__drivermansuffix__)
.SH AUTHORS
Authors include: Gerd Knorr, Michel D\(:anzer, Geert Uytterhoeven
commit 092f0f10cb243ef011a38a92e4eb48d424de80fa
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Nov 23 20:04:30 2008 -0500
Make ISA optional
diff --git a/configure.ac b/configure.ac
index ec3d7aa..7e82996 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,14 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+save_CFLAGS="$CFLAGS"
+CFLAGS="$XORG_CFLAGS"
+AC_CHECK_DECL(xf86ConfigIsaEntity,
+ [AC_DEFINE(HAVE_ISA, 1, [Have ISA support])],
+ [],
+ [#include "xf86.h"])
+CFLAGS="$save_CFLAGS"
+
AM_CONDITIONAL(PCIACCESS, [test "x$PCIACCESS" = xyes])
if test "x$PCIACCESS" = xyes; then
AC_DEFINE(PCIACCESS, 1, [Use libpciaccess])
diff --git a/src/fbdev.c b/src/fbdev.c
index df278f5..7f1a749 100644
--- a/src/fbdev.c
+++ b/src/fbdev.c
@@ -373,9 +373,7 @@ FBDevProbe(DriverPtr drv, int flags)
for (i = 0; i < numDevSections; i++) {
Bool isIsa = FALSE;
-#ifndef XSERVER_LIBPCIACCESS
Bool isPci = FALSE;
-#endif
dev = xf86FindOptionValue(devSections[i]->options,"fbdev");
if (devSections[i]->busID) {
@@ -387,14 +385,18 @@ FBDevProbe(DriverPtr drv, int flags)
isPci = TRUE;
} else
#endif
+#ifdef HAVE_ISA
if (xf86ParseIsaBusString(devSections[i]->busID))
isIsa = TRUE;
+ else
+#endif
+ 0;
}
if (fbdevHWProbe(NULL,dev,NULL)) {
pScrn = NULL;
-#ifndef XSERVER_LIBPCIACCESS
if (isPci) {
+#ifndef XSERVER_LIBPCIACCESS
/* XXX what about when there's no busID set? */
int entity;
@@ -410,9 +412,9 @@ FBDevProbe(DriverPtr drv, int flags)
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
"claimed PCI slot %d:%d:%d\n",bus,device,func);
- } else
#endif
- if (isIsa) {
+ } else if (isIsa) {
+#ifdef HAVE_ISA
int entity;
entity = xf86ClaimIsaSlot(drv, 0,
@@ -420,6 +422,7 @@ FBDevProbe(DriverPtr drv, int flags)
pScrn = xf86ConfigIsaEntity(pScrn,0,entity,
NULL,RES_SHARED_VGA,
NULL,NULL,NULL,NULL);
+#endif
} else {
int entity;
Reply to: