xserver-xorg-video-fbdev: Changes to 'ubuntu'
ChangeLog | 195 ++++++++++++++++++++
configure.ac | 40 +---
debian/changelog | 30 +++
debian/control | 4
debian/patches/01_fbdev_man.diff | 13 -
debian/patches/02-support-building-without-xv.patch | 37 +--
debian/patches/series | 1
man/Makefile.am | 22 --
man/fbdev.man | 5
src/Makefile.am | 1
src/compat-api.h | 101 ++++++++++
src/fbdev.c | 105 +++++-----
12 files changed, 423 insertions(+), 131 deletions(-)
New commits:
commit 20b89105bad52116cdae1562aae0ccc0df1202df
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 18 14:31:36 2012 +0200
Remaining Ubuntu changes:
- debian/patches/100_bgnoneroot.patch: support Plymouth crossfade.
diff --git a/debian/changelog b/debian/changelog
index 473380d..0f7695e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ xserver-xorg-video-fbdev (1:0.4.3-1) UNRELEASED; urgency=low
- No longer applies/valid
* Refresh 02-support-building-without-xv.patch
* Bump Standards-Version to 3.9.3 (no changes needed).
+ * Remaining Ubuntu changes:
+ - debian/patches/100_bgnoneroot.patch: support Plymouth crossfade.
-- Maarten Lankhorst <maarten.lankhorst@canonical.com> Wed, 18 Jul 2012 14:22:37 +0200
commit 0352d8734e2966fbd0b22ccd195833e70a0da498
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 18 14:28:34 2012 +0200
Refresh
* Remove 01_fbdev_man.diff
- No longer applies/valid
* Refresh 02-support-building-without-xv.patch
* Bump Standards-Version to 3.9.3 (no changes needed).
diff --git a/debian/changelog b/debian/changelog
index 4d0935c..4b29403 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
xserver-xorg-video-fbdev (1:0.4.3-1) UNRELEASED; urgency=low
* New upstream release 0.4.3
+ * Remove 01_fbdev_man.diff
+ - No longer applies/valid
+ * Refresh 02-support-building-without-xv.patch
+ * Bump Standards-Version to 3.9.3 (no changes needed).
-- Maarten Lankhorst <maarten.lankhorst@canonical.com> Wed, 18 Jul 2012 14:22:37 +0200
diff --git a/debian/control b/debian/control
index 514bb6f..9fba913 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
x11proto-render-dev,
x11proto-video-dev,
xutils-dev (>= 1:7.5+1),
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-fbdev
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-fbdev.git
diff --git a/debian/patches/01_fbdev_man.diff b/debian/patches/01_fbdev_man.diff
deleted file mode 100644
index 10413c3..0000000
--- a/debian/patches/01_fbdev_man.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- xserver-xorg-video-fbdev.orig/man/fbdev.man
-+++ xserver-xorg-video-fbdev/man/fbdev.man
-@@ -38,8 +38,8 @@
- driver and will use it if there are no video modes configured.
- .PP
- For PCI boards you might have to add a BusID line to the Device
--section. See above for a sample line. You can use \*q\__xservername__
---scanpci\*q
-+section. See above for a sample line. You can use \*q__xservername__
-+\-scanpci\*q
- to figure out the correct values.
- .PP
- The following driver
diff --git a/debian/patches/02-support-building-without-xv.patch b/debian/patches/02-support-building-without-xv.patch
index 34fa88a..35414f0 100644
--- a/debian/patches/02-support-building-without-xv.patch
+++ b/debian/patches/02-support-building-without-xv.patch
@@ -8,22 +8,20 @@ Subject: [PATCH] Support building without XV.
src/fbdev.c | 2 ++
2 files changed, 13 insertions(+), 0 deletions(-)
-diff --git a/configure.ac b/configure.ac
-index f76cca0..8fa2204 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -50,6 +50,10 @@ AC_ARG_ENABLE(pciaccess, AS_HELP_STRING([--enable-pciaccess],
+@@ -55,6 +55,10 @@
+ AC_ARG_ENABLE(pciaccess, AS_HELP_STRING([--enable-pciaccess],
[Enable use of libpciaccess (default: disabled)]),
[PCIACCESS=$enableval], [PCIACCESS=no])
-
+AC_ARG_ENABLE(xv, AS_HELP_STRING([--enable-xv],
+ [Enable use of xv (default: enabled)]),
+ [USE_XV=$enableval], [USE_XV=yes])
+
- # Checks for extensions
+
+ # Store the list of server defined optional extensions in REQUIRED_MODULES
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
-@@ -74,6 +78,13 @@ if test "x$PCIACCESS" = xyes; then
+@@ -79,6 +83,13 @@
XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
fi
@@ -36,27 +34,22 @@ index f76cca0..8fa2204 100644
+
# Checks for libraries.
- # Checks for header files.
-diff --git a/src/fbdev.c b/src/fbdev.c
-index 149bb24..a42f282 100644
+
--- a/src/fbdev.c
+++ b/src/fbdev.c
-@@ -936,6 +936,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- fPtr->CloseScreen = pScreen->CloseScreen;
- pScreen->CloseScreen = FBDevCloseScreen;
+@@ -456,6 +456,7 @@
+ return FALSE;
+ }
+#if USE_XV
{
- XF86VideoAdaptorPtr *ptr;
+ Gamma zeros = {0.0, 0.0, 0.0};
-@@ -944,6 +945,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- xf86XVScreenInit(pScreen,ptr,n);
- }
+@@ -463,6 +464,7 @@
+ return FALSE;
+ }
}
+#endif
- TRACE_EXIT("FBDevScreenInit");
-
---
-1.6.6.2
-
+ pScrn->progClock = TRUE;
+ pScrn->rgbBits = 8;
diff --git a/debian/patches/series b/debian/patches/series
index 9129956..c1cac1b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-01_fbdev_man.diff
02-support-building-without-xv.patch
commit cbcbb511f239c3cf506d10e0bc3999f183e1ee8a
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 18 14:22:57 2012 +0200
New upstream release 0.4.3
diff --git a/debian/changelog b/debian/changelog
index f860782..4d0935c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-fbdev (1:0.4.3-1) UNRELEASED; urgency=low
+
+ * New upstream release 0.4.3
+
+ -- Maarten Lankhorst <maarten.lankhorst@canonical.com> Wed, 18 Jul 2012 14:22:37 +0200
+
xserver-xorg-video-fbdev (1:0.4.2-7) experimental; urgency=low
* Build against Xserver 1.12 RC1.
commit f89ff1fee729b85576ff756be6e3b6190a2cca62
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 18 14:22:31 2012 +0200
Bump ChangeLog
diff --git a/ChangeLog b/ChangeLog
index 8f1a4c9..911df67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,198 @@
+commit 2edaad4ab2c75e6863caa529d27cd141f579914a
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon Jul 2 12:47:08 2012 +0100
+
+ fbdev: bump to 0.4.3
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 8a65ca2fdcc8657ed3b4a72051c6f85bcecc2c18
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jun 5 11:29:31 2012 +0100
+
+ fbdev: port to new server API.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 91e8b295f87fba81369b19969900f0981e8ba9cd
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jun 5 11:21:08 2012 +0100
+
+ fbdev: convert to new screen conversion APIs.
+
+ Generated using util/modular/x-driver-screen-scrn-conv.sh
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 6e29cf8c2927f81e1e5890a46bf03182079cc062
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jun 5 11:20:49 2012 +0100
+
+ fbdev: add compat-api + makefile
+
+commit a87213930e399c0d5a8183f6cc7e98ed6d092638
+Author: Paulo Zanoni <pzanoni@mandriva.com>
+Date: Thu Nov 4 17:02:01 2010 -0200
+
+ Add MOD_CLASS_VIDEODRV to FBDevVersRec
+
+ fbdev seems to be the only video driver without MOD_CLASS_VIDEODRV
+
+ Signed-off-by: Paulo Zanoni <pzanoni@mandriva.com>
+ Reviewed-by: Jesse Adkins <jesserayadkins@gmail.com>
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit be003f2568366ff9fc2ff70d6a69df64a2a25cca
+Author: Cyril Brulebois <kibi@debian.org>
+Date: Mon Nov 8 14:10:44 2010 +0100
+
+ Perform XV initialization only if the server supports it.
+
+ Use XV from server's xorg-server.h to determine whether to perform XV
+ initialization.
+
+ Signed-off-by: Cyril Brulebois <kibi@debian.org>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit 20909cd806af488cf529c74417afbc8a12438f4a
+Author: Cyril Brulebois <kibi@debian.org>
+Date: Mon Nov 8 13:23:35 2010 +0100
+
+ Avoid unused variables when XSERVER_LIBPCIACCESS is defined.
+
+ Signed-off-by: Cyril Brulebois <kibi@debian.org>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit 90524a26d3458e3d1cbb4e1ecbc4db71714b8929
+Author: Cyril Brulebois <kibi@debian.org>
+Date: Mon Nov 8 13:35:29 2010 +0100
+
+ man: Stop mentioning server's -scanpci option.
+
+ It got removed in server's 9727db88d57089be6483104de435626cdbad883a
+ (long time ago).
+
+ Signed-off-by: Cyril Brulebois <kibi@debian.org>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit 0d45d8f3ad20073595a675f80dd8a4bfe68babfd
+Author: Cyril Brulebois <kibi@debian.org>
+Date: Sun Nov 7 15:36:46 2010 +0100
+
+ Convert x{re,c,}alloc and xfree.
+
+ Signed-off-by: Cyril Brulebois <kibi@debian.org>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit 049cdddd14789e00d7db59c44494f90396796992
+Author: Jesse Adkins <jesserayadkins@gmail.com>
+Date: Tue Sep 28 13:29:51 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit d3a2fe1b761533909646cae9c35c07f237a9f5e3
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 16:49:04 2010 -0400
+
+ config: add comments for main statements
+
+commit f7e68d16dc80fc63ca7f7661378bd6074b8eefa6
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 16:07:00 2010 -0400
+
+ config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 0ddf357522eff86288e44d19effe380affbc88a4
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 14:37:41 2010 -0400
+
+ config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 55e0de6cb19faa7d870971f035b41d687af27f0d
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 14:05:22 2010 -0400
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit a05560b1d37f47a73e1545ef1ba4221d84db1e3c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 09:27:42 2010 -0400
+
+ config: complete AC_INIT m4 quoting
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 8f7d8a7ba33ca16dea37c26268ceb0a93d407a16
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 21:44:57 2010 -0400
+
+ config: remove unrequired AC_SUBST([XORG_CFLAGS])
+
+ This macro is called by PKG_CHECK_MODULES
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 9b3ef42fdd29b46b1edc207052f1fa9c925a7276
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 20:24:42 2010 -0400
+
+ config: remove unrequired AC_HEADER_STDC
+
+ Autoconf says:
+ "This macro is obsolescent, as current systems have conforming
+ header files. New programs need not use this macro".
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit b768d66b87287ac46c2850f816219d75e6b1d21e
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 19:41:30 2010 -0400
+
+ config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+ XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+ AC_PROG_C_C99. This sets gcc with -std=gnu99.
+ If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit fa588a1ddcc095166d8e305d6a1c79970d1e70ec
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 18:45:19 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 6977b3490a626247bdc979e8afc6e5a8b9e19896
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 16:15:29 2010 -0400
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
commit 7ec9d466e55e6366bf35639610b14a149f6e7b45
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 3 18:05:21 2010 +0200
commit 2edaad4ab2c75e6863caa529d27cd141f579914a
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jul 2 12:47:08 2012 +0100
fbdev: bump to 0.4.3
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/configure.ac b/configure.ac
index 6010c70..188ce6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-fbdev],
- [0.4.2],
+ [0.4.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-fbdev])
AC_CONFIG_SRCDIR([Makefile.am])
commit 8a65ca2fdcc8657ed3b4a72051c6f85bcecc2c18
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jun 5 11:29:31 2012 +0100
fbdev: port to new server API.
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/src/compat-api.h b/src/compat-api.h
index 1bb7724..b74a582 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -38,4 +38,64 @@
#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
#endif
+#ifndef XF86_SCRN_INTERFACE
+
+#define SCRN_ARG_TYPE int
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
+
+#define SCREEN_ARG_TYPE int
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
+
+#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
+
+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
+#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
+
+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
+#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
+
+#define FREE_SCREEN_ARGS_DECL int arg, int flags
+#define FREE_SCREEN_ARGS(x) (x)->scrnIndex, 0
+
+#define VT_FUNC_ARGS_DECL int arg, int flags
+#define VT_FUNC_ARGS(flags) pScrn->scrnIndex, (flags)
+
+#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex)
+#else
+#define SCRN_ARG_TYPE ScrnInfoPtr
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
+
+#define SCREEN_ARG_TYPE ScreenPtr
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
+
+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS pScreen
+
+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
+#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
+
+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
+#define SWITCH_MODE_ARGS(arg, m) arg, m
+
+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
+#define FREE_SCREEN_ARGS(x) (x)
+
+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
+#define VT_FUNC_ARGS(flags) pScrn
+
+#define XF86_ENABLEDISABLEFB_ARG(x) (x)
+
+#endif
+
#endif
diff --git a/src/fbdev.c b/src/fbdev.c
index 5183bdc..cd7ebc5 100644
--- a/src/fbdev.c
+++ b/src/fbdev.c
@@ -59,12 +59,11 @@ static Bool FBDevPciProbe(DriverPtr drv, int entity_num,
struct pci_device *dev, intptr_t match_data);
#endif
static Bool FBDevPreInit(ScrnInfoPtr pScrn, int flags);
-static Bool FBDevScreenInit(int Index, ScreenPtr pScreen, int argc,
- char **argv);
-static Bool FBDevCloseScreen(int scrnIndex, ScreenPtr pScreen);
+static Bool FBDevScreenInit(SCREEN_INIT_ARGS_DECL);
+static Bool FBDevCloseScreen(CLOSE_SCREEN_ARGS_DECL);
static void * FBDevWindowLinear(ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode,
CARD32 *size, void *closure);
-static void FBDevPointerMoved(int index, int x, int y);
+static void FBDevPointerMoved(SCRN_ARG_TYPE arg, int x, int y);
static Bool FBDevDGAInit(ScrnInfoPtr pScrn, ScreenPtr pScreen);
static Bool FBDevDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op,
pointer ptr);
@@ -189,7 +188,7 @@ typedef struct {
void *shadow;
CloseScreenProcPtr CloseScreen;
CreateScreenResourcesProcPtr CreateScreenResources;
- void (*PointerMoved)(int index, int x, int y);
+ void (*PointerMoved)(SCRN_ARG_TYPE arg, int x, int y);
EntityInfoPtr pEnt;
/* DGA info */
DGAModePtr pDGAMode;
@@ -653,7 +652,7 @@ FBDevShadowInit(ScreenPtr pScreen)
static Bool
-FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+FBDevScreenInit(SCREEN_INIT_ARGS_DECL)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
FBDevPtr fPtr = FBDEVPTR(pScrn);
@@ -675,7 +674,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
#endif
if (NULL == (fPtr->fbmem = fbdevHWMapVidmem(pScrn))) {
- xf86DrvMsg(scrnIndex,X_ERROR,"mapping of video memory"
+ xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"mapping of video memory"
" failed\n");
return FALSE;
}
@@ -684,17 +683,17 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
fbdevHWSave(pScrn);
if (!fbdevHWModeInit(pScrn, pScrn->currentMode)) {
- xf86DrvMsg(scrnIndex,X_ERROR,"mode initialization failed\n");
+ xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"mode initialization failed\n");
return FALSE;
}
fbdevHWSaveScreen(pScreen, SCREEN_SAVER_ON);
- fbdevHWAdjustFrame(scrnIndex,0,0,0);
+ fbdevHWAdjustFrame(ADJUST_FRAME_ARGS(pScrn, 0, 0));
/* mi layer */
miClearVisualTypes();
if (pScrn->bitsPerPixel > 8) {
if (!miSetVisualTypes(pScrn->depth, TrueColorMask, pScrn->rgbBits, TrueColor)) {
- xf86DrvMsg(scrnIndex,X_ERROR,"visual type setup failed"
+ xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"visual type setup failed"
" for %d bits per pixel [1]\n",
pScrn->bitsPerPixel);
return FALSE;
@@ -703,14 +702,14 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
if (!miSetVisualTypes(pScrn->depth,
miGetDefaultVisualMask(pScrn->depth),
pScrn->rgbBits, pScrn->defaultVisual)) {
- xf86DrvMsg(scrnIndex,X_ERROR,"visual type setup failed"
+ xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"visual type setup failed"
" for %d bits per pixel [2]\n",
pScrn->bitsPerPixel);
return FALSE;
}
}
if (!miSetPixmapDepths()) {
- xf86DrvMsg(scrnIndex,X_ERROR,"pixmap depth setup failed\n");
+ xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"pixmap depth setup failed\n");
return FALSE;
}
@@ -726,7 +725,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
(pScrn->bitsPerPixel / 8);
if (pScrn->displayWidth != pScrn->virtualX) {
- xf86DrvMsg(scrnIndex, X_INFO,
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Pitch updated to %d after ModeInit\n",
pScrn->displayWidth);
}
@@ -766,7 +765,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
init_picture = 1;
break;
default:
- xf86DrvMsg(scrnIndex, X_ERROR,
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"internal error: invalid number of bits per"
" pixel (%d) encountered in"
" FBDevScreenInit()\n", pScrn->bitsPerPixel);
@@ -777,7 +776,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
case FBDEVHW_INTERLEAVED_PLANES:
/* This should never happen ...
* we should check for this much much earlier ... */
- xf86DrvMsg(scrnIndex, X_ERROR,
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"internal error: interleaved planes are not yet "
"supported by the fbdev driver\n");
ret = FALSE;
@@ -785,20 +784,20 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
case FBDEVHW_TEXT:
/* This should never happen ...
* we should check for this much much earlier ... */
- xf86DrvMsg(scrnIndex, X_ERROR,
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"internal error: text mode is not supported by the "
"fbdev driver\n");
ret = FALSE;
break;
case FBDEVHW_VGA_PLANES:
/* Not supported yet */
- xf86DrvMsg(scrnIndex, X_ERROR,
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"internal error: EGA/VGA Planes are not yet "
"supported by the fbdev driver\n");
ret = FALSE;
break;
default:
- xf86DrvMsg(scrnIndex, X_ERROR,
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"internal error: unrecognised hardware type (%d) "
"encountered in FBDevScreenInit()\n", type);
ret = FALSE;
@@ -828,7 +827,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
"Render extension initialisation failed\n");
if (fPtr->shadowFB && !FBDevShadowInit(pScreen)) {
- xf86DrvMsg(scrnIndex, X_ERROR,
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"shadow framebuffer initialization failed\n");
return FALSE;
}
@@ -836,12 +835,12 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
if (!fPtr->rotate)
FBDevDGAInit(pScrn, pScreen);
else {
- xf86DrvMsg(scrnIndex, X_INFO, "display rotated; disabling DGA\n");
- xf86DrvMsg(scrnIndex, X_INFO, "using driver rotation; disabling "
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "display rotated; disabling DGA\n");
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "using driver rotation; disabling "
"XRandR\n");
xf86DisableRandR();
if (pScrn->bitsPerPixel == 24)
- xf86DrvMsg(scrnIndex, X_WARNING, "rotation might be broken at 24 "
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "rotation might be broken at 24 "
"bits per pixel\n");
}
@@ -858,29 +857,29 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
/* XXX It would be simpler to use miCreateDefColormap() in all cases. */
case FBDEVHW_PACKED_PIXELS:
if (!miCreateDefColormap(pScreen)) {
- xf86DrvMsg(scrnIndex, X_ERROR,
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"internal error: miCreateDefColormap failed "
"in FBDevScreenInit()\n");
return FALSE;
}
break;
case FBDEVHW_INTERLEAVED_PLANES:
- xf86DrvMsg(scrnIndex, X_ERROR,
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"internal error: interleaved planes are not yet "
"supported by the fbdev driver\n");
return FALSE;
case FBDEVHW_TEXT:
- xf86DrvMsg(scrnIndex, X_ERROR,
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"internal error: text mode is not supported by "
"the fbdev driver\n");
return FALSE;
case FBDEVHW_VGA_PLANES:
- xf86DrvMsg(scrnIndex, X_ERROR,
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"internal error: EGA/VGA planes are not yet "
"supported by the fbdev driver\n");
return FALSE;
default:
- xf86DrvMsg(scrnIndex, X_ERROR,
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"internal error: unrecognised fbdev hardware type "
"(%d) encountered in FBDevScreenInit()\n", type);
return FALSE;
@@ -915,9 +914,9 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
}
static Bool
-FBDevCloseScreen(int scrnIndex, ScreenPtr pScreen)
+FBDevCloseScreen(CLOSE_SCREEN_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
FBDevPtr fPtr = FBDEVPTR(pScrn);
fbdevHWRestore(pScrn);
@@ -936,7 +935,7 @@ FBDevCloseScreen(int scrnIndex, ScreenPtr pScreen)
pScreen->CreateScreenResources = fPtr->CreateScreenResources;
pScreen->CloseScreen = fPtr->CloseScreen;
- return (*pScreen->CloseScreen)(scrnIndex, pScreen);
+ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
}
@@ -964,9 +963,9 @@ FBDevWindowLinear(ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode,
}
static void
-FBDevPointerMoved(int index, int x, int y)
+FBDevPointerMoved(SCRN_ARG_TYPE arg, int x, int y)
{
- ScrnInfoPtr pScrn = xf86Screens[index];
+ SCRN_INFO_PTR(arg);
FBDevPtr fPtr = FBDEVPTR(pScrn);
int newX, newY;
@@ -998,7 +997,7 @@ FBDevPointerMoved(int index, int x, int y)
}
/* Pass adjusted pointer coordinates to wrapped PointerMoved function. */
- (*fPtr->PointerMoved)(index, newX, newY);
+ (*fPtr->PointerMoved)(arg, newX, newY);
}
@@ -1045,9 +1044,9 @@ FBDevDGASetMode(ScrnInfoPtr pScrn, DGAModePtr pDGAMode)
frameY0 = pScrn->frameY0;
}
- if (!(*pScrn->SwitchMode)(scrnIdx, pMode, 0))
+ if (!(*pScrn->SwitchMode)(SWITCH_MODE_ARGS(pScrn, pMode)))
return FALSE;
- (*pScrn->AdjustFrame)(scrnIdx, frameX0, frameY0, 0);
+ (*pScrn->AdjustFrame)(ADJUST_FRAME_ARGS(pScrn, frameX0, frameY0));
return TRUE;
}
@@ -1055,7 +1054,7 @@ FBDevDGASetMode(ScrnInfoPtr pScrn, DGAModePtr pDGAMode)
static void
FBDevDGASetViewport(ScrnInfoPtr pScrn, int x, int y, int flags)
{
- (*pScrn->AdjustFrame)(pScrn->pScreen->myNum, x, y, flags);
+ (*pScrn->AdjustFrame)(ADJUST_FRAME_ARGS(pScrn, x, y));
}
static int
commit 91e8b295f87fba81369b19969900f0981e8ba9cd
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jun 5 11:21:08 2012 +0100
fbdev: convert to new screen conversion APIs.
Generated using util/modular/x-driver-screen-scrn-conv.sh
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/src/fbdev.c b/src/fbdev.c
index 52acef8..5183bdc 100644
--- a/src/fbdev.c
+++ b/src/fbdev.c
@@ -613,7 +613,7 @@ static Bool
FBDevCreateScreenResources(ScreenPtr pScreen)
{
PixmapPtr pPixmap;
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
FBDevPtr fPtr = FBDEVPTR(pScrn);
Bool ret;
@@ -638,7 +638,7 @@ FBDevCreateScreenResources(ScreenPtr pScreen)
static Bool
FBDevShadowInit(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
FBDevPtr fPtr = FBDEVPTR(pScrn);
if (!shadowSetup(pScreen)) {
@@ -655,7 +655,7 @@ FBDevShadowInit(ScreenPtr pScreen)
static Bool
FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
FBDevPtr fPtr = FBDEVPTR(pScrn);
VisualPtr visual;
int init_picture = 0;
@@ -949,7 +949,7 @@ static void *
FBDevWindowLinear(ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode,
CARD32 *size, void *closure)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
FBDevPtr fPtr = FBDEVPTR(pScrn);
if (!pScrn->vtSema)
commit 6e29cf8c2927f81e1e5890a46bf03182079cc062
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jun 5 11:20:49 2012 +0100
fbdev: add compat-api + makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 1203177..fbe420e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,4 +29,5 @@ fbdev_drv_la_LDFLAGS = -module -avoid-version
fbdev_drv_ladir = @moduledir@/drivers
fbdev_drv_la_SOURCES = \
+ compat-api.h \
fbdev.c
diff --git a/src/compat-api.h b/src/compat-api.h
new file mode 100644
index 0000000..1bb7724
--- /dev/null
+++ b/src/compat-api.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2012 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Author: Dave Airlie <airlied@redhat.com>
+ */
+
+/* this file provides API compat between server post 1.13 and pre it,
+ it should be reused inside as many drivers as possible */
+#ifndef COMPAT_API_H
+#define COMPAT_API_H
+
+#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
+#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
+#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
+#endif
+
+#ifndef XF86_HAS_SCRN_CONV
+#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
+#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
+#endif
+
+#endif
diff --git a/src/fbdev.c b/src/fbdev.c
index 794adfb..52acef8 100644
--- a/src/fbdev.c
+++ b/src/fbdev.c
@@ -33,6 +33,8 @@
#include "xf86xv.h"
+#include "compat-api.h"
+
#ifdef XSERVER_LIBPCIACCESS
#include <pciaccess.h>
#endif
commit 06835ab769bc2624389ec7ff7c5f4d3f7510bb2e
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jan 1 06:06:06 2012 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 29b8c51..f860782 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-fbdev (1:0.4.2-7) UNRELEASED; urgency=low
+xserver-xorg-video-fbdev (1:0.4.2-7) experimental; urgency=low
* Build against Xserver 1.12 RC1.
- -- Cyril Brulebois <kibi@debian.org> Sat, 31 Dec 2011 20:16:31 +0100
+ -- Cyril Brulebois <kibi@debian.org> Sun, 01 Jan 2012 06:06:00 +0100
xserver-xorg-video-fbdev (1:0.4.2-6) experimental; urgency=low
commit 1423cfd29b52ea16c1ac724113d63f3e199f4aca
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jan 1 06:05:46 2012 +0100
Build against Xserver 1.12 RC1.
diff --git a/debian/changelog b/debian/changelog
index 670fcb1..29b8c51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-fbdev (1:0.4.2-7) UNRELEASED; urgency=low
+
+ * Build against Xserver 1.12 RC1.
+
+ -- Cyril Brulebois <kibi@debian.org> Sat, 31 Dec 2011 20:16:31 +0100
+
xserver-xorg-video-fbdev (1:0.4.2-6) experimental; urgency=low
* Rebuild against Xserver 1.10 rc3.
diff --git a/debian/control b/debian/control
index 157e07c..514bb6f 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
dh-autoreconf,
quilt,
pkg-config,
- xserver-xorg-dev (>= 2:1.9.99.903),
+ xserver-xorg-dev (>= 2:1.11.99.901),
x11proto-core-dev,
x11proto-fonts-dev,
x11proto-randr-dev,
commit 1b02f69113d396b96b7cbb99dc6ee9cc63af6edc
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 25 15:53:24 2011 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index e49c03e..670fcb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-fbdev (1:0.4.2-6) UNRELEASED; urgency=low
+xserver-xorg-video-fbdev (1:0.4.2-6) experimental; urgency=low
* Rebuild against Xserver 1.10 rc3.
- -- Cyril Brulebois <kibi@debian.org> Fri, 25 Feb 2011 15:53:17 +0100
+ -- Cyril Brulebois <kibi@debian.org> Fri, 25 Feb 2011 15:53:24 +0100
xserver-xorg-video-fbdev (1:0.4.2-5) experimental; urgency=low
commit 282e6681a6b3d66db221041bf5550035a0dd1ec7
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 25 15:53:18 2011 +0100
Rebuild against Xserver 1.10 rc3.
diff --git a/debian/changelog b/debian/changelog
index c5b96f8..e49c03e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-fbdev (1:0.4.2-6) UNRELEASED; urgency=low
+
+ * Rebuild against Xserver 1.10 rc3.
+
+ -- Cyril Brulebois <kibi@debian.org> Fri, 25 Feb 2011 15:53:17 +0100
+
xserver-xorg-video-fbdev (1:0.4.2-5) experimental; urgency=low
* Rebuild against Xserver 1.10 rc2.
diff --git a/debian/control b/debian/control
index 656fccc..157e07c 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
dh-autoreconf,
quilt,
pkg-config,
- xserver-xorg-dev (>= 2:1.9.99.902),
+ xserver-xorg-dev (>= 2:1.9.99.903),
x11proto-core-dev,
x11proto-fonts-dev,
Reply to: