xserver-xorg-video-ark: Changes to 'debian-unstable'
ChangeLog | 141 -------------------------------------------------------
configure.ac | 19 +++++++
debian/changelog | 12 ++++
debian/control | 4 -
src/Makefile.am | 1
src/ark.h | 7 ++
src/ark_accel.c | 12 ++--
src/ark_driver.c | 60 +++++++++++------------
src/compat-api.h | 99 ++++++++++++++++++++++++++++++++++++++
9 files changed, 174 insertions(+), 181 deletions(-)
New commits:
commit 57bcb9ae17f642d80558d62789d39bd4300893d2
Author: Michele Cane <michele.cane@gmail.com>
Date: Fri Jul 26 19:35:37 2013 +0200
Build against Xserver 1.14.
diff --git a/debian/changelog b/debian/changelog
index 058c588..be5112a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xserver-xorg-video-ark (1:0.7.5-1) UNRELEASED; urgency=low
[ Michele Cane ]
* Bump Standards-Version to 3.9.4, no changes needed.
+ * Build against Xserver 1.14.
-- Maarten Lankhorst <maarten.lankhorst@canonical.com> Wed, 18 Jul 2012 15:51:26 +0200
diff --git a/debian/control b/debian/control
index 9299cbe..decf147 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
dh-autoreconf,
quilt,
pkg-config,
- xserver-xorg-dev (>= 2:1.9.4),
+ xserver-xorg-dev (>= 2:1.14),
x11proto-core-dev,
x11proto-fonts-dev,
x11proto-xext-dev,
commit 12f4e025f1b481977e2978300e79beaaaf4ca81d
Author: Michele Cane <michele.cane@gmail.com>
Date: Fri Jul 26 19:32:37 2013 +0200
Bump Standards-Version to 3.9.4, no changes needed.
diff --git a/debian/changelog b/debian/changelog
index dbd4316..058c588 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
xserver-xorg-video-ark (1:0.7.5-1) UNRELEASED; urgency=low
+ [ Maarten Lankhorst ]
* New upstream release.
* Bump Standards-Version to 3.9.3 (no changes needed)
+ [ Michele Cane ]
+ * Bump Standards-Version to 3.9.4, no changes needed.
+
-- Maarten Lankhorst <maarten.lankhorst@canonical.com> Wed, 18 Jul 2012 15:51:26 +0200
xserver-xorg-video-ark (1:0.7.4-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index fc5d34e..9299cbe 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
x11proto-xext-dev,
xutils-dev (>= 1:7.5+4),
libpciaccess-dev (>= 0.12.901),
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ark
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ark.git
commit 13c0ee016ade090b1b127ac9cfff522484718218
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 18 15:52:41 2012 +0200
Bump Standards-Version to 3.9.3 (no changes needed)
diff --git a/debian/changelog b/debian/changelog
index 34d8b0a..dbd4316 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-ark (1:0.7.5-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump Standards-Version to 3.9.3 (no changes needed)
-- Maarten Lankhorst <maarten.lankhorst@canonical.com> Wed, 18 Jul 2012 15:51:26 +0200
diff --git a/debian/control b/debian/control
index bd366a8..fc5d34e 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
x11proto-xext-dev,
xutils-dev (>= 1:7.5+4),
libpciaccess-dev (>= 0.12.901),
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ark
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ark.git
commit 593c3750a34d2a7ccc4e3bfb356dcb652b0b706b
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 18 15:51:49 2012 +0200
New upstream release.
diff --git a/debian/changelog b/debian/changelog
index 9e9fdd9..34d8b0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ark (1:0.7.5-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Maarten Lankhorst <maarten.lankhorst@canonical.com> Wed, 18 Jul 2012 15:51:26 +0200
+
xserver-xorg-video-ark (1:0.7.4-1) unstable; urgency=low
* New upstream release.
commit 79eba4c6279d24f79d3210b2d2adc64a2abc8d19
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 18 15:51:19 2012 +0200
Bump changelog
diff --git a/ChangeLog b/ChangeLog
index 4b677a2..20c5867 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,144 +1,3 @@
-commit da0262acee5ea37ea8c69ebadbf5e9e34d83b5f3
-Author: Matt Turner <mattst88@gmail.com>
-Date: Thu Feb 16 18:39:50 2012 -0500
-
- Don't check for unneeded proto headers.
-
- Signed-off-by: Matt Turner <mattst88@gmail.com>
-
-commit e7baf1df0bbc45e1cd697f5df959586ab27103f9
-Author: Matt Turner <mattst88@gmail.com>
-Date: Thu Jan 26 18:04:34 2012 -0500
-
- xf86-video-ark 0.7.4
-
- Signed-off-by: Matt Turner <mattst88@gmail.com>
-
-commit c2667fb882429f9393b0700a2befe6dde4523f02
-Author: Matt Turner <mattst88@gmail.com>
-Date: Thu Jan 26 18:03:16 2012 -0500
-
- Change types of FBBase/MMIOBase to pointer, remove casts
-
- Signed-off-by: Matt Turner <mattst88@gmail.com>
-
-commit 99ed41779e28bace7c3321a6d05e6436d4784c48
-Author: Matt Turner <mattst88@gmail.com>
-Date: Thu Jan 26 17:57:42 2012 -0500
-
- Use pci_device_map_legacy rather than xf86MapDomainMemory
-
- Signed-off-by: Matt Turner <mattst88@gmail.com>
-
-commit 5634e78e42d14ab2325854093a42536844cae07f
-Author: Matt Turner <mattst88@gmail.com>
-Date: Thu Jan 26 17:44:36 2012 -0500
-
- Fix typo in 5ab0bf04
-
- Signed-off-by: Matt Turner <mattst88@gmail.com>
-
-commit c043cc44316f655c9f267bd20d1ea3e3e2b2da91
-Author: Matt Turner <mattst88@gmail.com>
-Date: Thu Jan 26 17:32:12 2012 -0500
-
- Use unsigned long rather than deprecated IOADDRESS
-
- Signed-off-by: Matt Turner <mattst88@gmail.com>
-
-commit 1cac2174beb340f9a8b868818a5261b80435d3eb
-Author: Matt Turner <mattst88@gmail.com>
-Date: Thu Jan 26 17:31:26 2012 -0500
-
- Remove uses of xf86PciInfo.h
-
- Signed-off-by: Matt Turner <mattst88@gmail.com>
-
-commit bd0aa75692cc421bfeada64239fc381c40bc2ec9
-Author: Matt Turner <mattst88@gmail.com>
-Date: Thu Jan 26 17:19:36 2012 -0500
-
- Add &component=Driver/ark to Bugzilla link
-
- Signed-off-by: Matt Turner <mattst88@gmail.com>
-
-commit 97a1aa4b460e6ffda16704954012063c094d770b
-Author: Matt Turner <mattst88@gmail.com>
-Date: Mon Sep 26 22:48:08 2011 -0400
-
- Remove if(E != NULL) checks around free(E)
-
- Signed-off-by: Matt Turner <mattst88@gmail.com>
-
-commit 70321db733c380a3b5f2198d733d75916f54c10b
-Author: Matt Turner <mattst88@gmail.com>
-Date: Mon Sep 26 22:46:51 2011 -0400
-
- Remove xalloc/xcalloc/xrealloc/xfree
-
- Signed-off-by: Matt Turner <mattst88@gmail.com>
-
-commit 5ab0bf04c400f3d7d97c931b5d9e1f0318cc6f59
-Author: Adam Jackson <ajax@redhat.com>
-Date: Mon Dec 19 17:44:49 2011 -0500
-
- Fix for new vgaHW ABI
-
- Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-commit 075a675e424cc2fbf7ab65e086b111ecfca7105f
-Author: Adam Jackson <ajax@redhat.com>
-Date: Mon Dec 19 16:11:53 2011 -0500
-
- Make failure to XAA non-fatal
-
- No shadowfb support in this driver yet.
-
- Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-commit d9492762b862aa02392a011ed70e38e77e33ee40
-Author: Adam Jackson <ajax@redhat.com>
-Date: Thu Nov 17 16:22:16 2011 -0500
-
- Adapt to videoabi 12
-
- Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-commit 9d3769bed020e9796e51411c63de337da5073bb4
-Author: Ondrej Zary <linux@rainbow-software.org>
-Date: Fri Dec 3 19:23:51 2010 -0500
-
- Don't assume that FB address registers are initialized properly
-
- https://bugs.freedesktop.org/show_bug.cgi?id=28249
-
- ark driver does not work with Hercules Stingray 64 card (ark2000pv).
- X fails to start with:
-
- [...]
- (II) ark(0): vgaHWGetIOBase: hwp->IOBase is 0x03d0, hwp->PIOOffset is
- 0x0000
- (II) ark(0): Creating default Display subsection in Screen section
- "Default Screen Section" for depth/fbbpp 24/32
- (==) ark(0): Depth 24, (--) framebuffer bpp 32
- (==) ark(0): RGB weight 888
- (==) ark(0): Default visual is TrueColor
- (**) ark(0): Chipset: "ark2000pv"
- (--) ark(0): Framebuffer @ 0xe5e50000
- (==) ark(0): Using gamma correction (1.0, 1.0, 1.0)
- (--) ark(0): Detected 2048 bytes video ram
- [...]
- Fatal server error:
- AddScreen/ScreenInit failed for driver 0
-
- Comparing with lspci, the framebuffer address is wrong:
- 00:0f.0 VGA compatible controller: ARK Logic Inc 2000PV [Stingray] (prog-if 00 [VGA controller])
- Flags: medium devsel
- Memory at e5000000 (32-bit, prefetchable) [size=4M]
- [virtual] Expansion ROM at 1c000000 [disabled] [size=64K]
-
- Reviewed-by: Adam Jackson <ajax@redhat.com>
-
commit 5013a760db93d08b0bb87b6ad2537b1073cedf36
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Jul 23 14:35:43 2010 -0700
commit 8d63c607ceab903dbe36eccf2315065e6830a47e
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 17 16:05:09 2012 +1000
xf86-video-ark: bump to version 0.7.5
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/configure.ac b/configure.ac
index 752ead8..c5fd78f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-ark],
- [0.7.4],
+ [0.7.5],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/ark],
[xf86-video-ark])
AC_CONFIG_SRCDIR([Makefile.am])
commit daf57a350326ff886de77609702944ec939a3495
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 17 14:51:38 2012 +1000
convert to new X screen conversion api
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/src/ark_accel.c b/src/ark_accel.c
index 2ec5070..d279b2f 100644
--- a/src/ark_accel.c
+++ b/src/ark_accel.c
@@ -189,7 +189,7 @@ static void ARKSubsequentScreenToScreenCopy(ScrnInfoPtr pScrn,
Bool ARKAccelInit(ScreenPtr pScreen)
{
#ifdef HAVE_XAA_H
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
ARKPtr pARK = ARKPTR(pScrn);
XAAInfoRecPtr pXAA;
commit 8c29d34510d7dfd786660827a09d1d60454ea32a
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 17 13:59:15 2012 +1000
ark: update for compat X server ABI.
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index fdc7bea..813234b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,6 +32,7 @@ ark_drv_la_LDFLAGS = -module -avoid-version
ark_drv_ladir = @moduledir@/drivers
ark_drv_la_SOURCES = \
+ compat-api.h \
ark_accel.c \
ark_driver.c \
ark.h \
diff --git a/src/ark.h b/src/ark.h
index bee8d1a..ba94b1a 100644
--- a/src/ark.h
+++ b/src/ark.h
@@ -12,6 +12,7 @@
#endif
#include "vgaHW.h"
+#include "compat-api.h"
#define PCI_VENDOR_ARK 0xEDD8
#define PCI_CHIP_1000PV 0xA091
#define PCI_CHIP_2000PV 0xA099
@@ -58,7 +59,7 @@ typedef struct _ARKRec {
int ramdac;
ARKRegRec SavedRegs; /* original mode */
ARKRegRec ModeRegs; /* current mode */
- Bool (*CloseScreen)(int, ScreenPtr);
+ Bool (*CloseScreen)(CLOSE_SCREEN_ARGS_DECL);
} ARKRec, *ARKPtr;
diff --git a/src/ark_driver.c b/src/ark_driver.c
index d550f2e..b7c287c 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -62,19 +62,18 @@ static const OptionInfoRec * ARKAvailableOptions(int chipid, int busid);
static void ARKIdentify(int flags);
static Bool ARKProbe(DriverPtr drv, int flags);
static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags);
-static Bool ARKEnterVT(int scrnIndex, int flags);
-static void ARKLeaveVT(int scrnIndex, int flags);
+static Bool ARKEnterVT(VT_FUNC_ARGS_DECL);
+static void ARKLeaveVT(VT_FUNC_ARGS_DECL);
static void ARKSave(ScrnInfoPtr pScrn);
-static Bool ARKScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
- char **argv);
+static Bool ARKScreenInit(SCREEN_INIT_ARGS_DECL);
static Bool ARKMapMem(ScrnInfoPtr pScrn);
static void ARKUnmapMem(ScrnInfoPtr pScrn);
static Bool ARKModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
-static void ARKAdjustFrame(int scrnIndex, int x, int y, int flags);
-Bool ARKSwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
-Bool ARKCloseScreen(int scrnIndex, ScreenPtr pScreen);
+static void ARKAdjustFrame(ADJUST_FRAME_ARGS_DECL);
+Bool ARKSwitchMode(SWITCH_MODE_ARGS_DECL);
+Bool ARKCloseScreen(CLOSE_SCREEN_ARGS_DECL);
Bool ARKSaveScreen(ScreenPtr pScreen, int mode);
-static void ARKFreeScreen(int scrnIndex, int flags);
+static void ARKFreeScreen(FREE_SCREEN_ARGS_DECL);
static void ARKLoadPalette(ScrnInfoPtr pScrn, int numColors,
int *indicies, LOCO *colors,
VisualPtr pVisual);
@@ -476,10 +475,9 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
return TRUE;
}
-static Bool ARKScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
- char **argv)
+static Bool ARKScreenInit(SCREEN_INIT_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
ARKPtr pARK = ARKPTR(pScrn);
pScrn->fbOffset = 0;
@@ -498,7 +496,7 @@ static Bool ARKScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
ARKSaveScreen(pScreen, SCREEN_SAVER_ON);
- pScrn->AdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
+ pScrn->AdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
miClearVisualTypes();
if (pScrn->bitsPerPixel > 8) {
@@ -545,13 +543,13 @@ static Bool ARKScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
if (!pARK->NoAccel) {
if (ARKAccelInit(pScreen)) {
- xf86DrvMsg(scrnIndex, X_INFO, "Acceleration enabled\n");
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Acceleration enabled\n");
} else {
- xf86DrvMsg(scrnIndex, X_ERROR, "Acceleration initialization failed\n");
- xf86DrvMsg(scrnIndex, X_INFO, "Acceleration disabled\n");
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Acceleration initialization failed\n");
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Acceleration disabled\n");
}
} else {
- xf86DrvMsg(scrnIndex, X_INFO, "Acceleration disabled\n");
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Acceleration disabled\n");
}
miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
@@ -889,9 +887,9 @@ static Bool ARKModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
}
-static void ARKAdjustFrame(int scrnIndex, int x, int y, int flags)
+static void ARKAdjustFrame(ADJUST_FRAME_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
ARKPtr pARK = ARKPTR(pScrn);
vgaHWPtr hwp = VGAHWPTR(pScrn);
unsigned long vgaIOBase = PIOOFFSET + hwp->IOBase;
@@ -988,23 +986,23 @@ static void ARKWriteMode(ScrnInfoPtr pScrn, vgaRegPtr pVga, ARKRegPtr new)
}
-static Bool ARKEnterVT(int scrnIndex, int flags)
+static Bool ARKEnterVT(VT_FUNC_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
if (!ARKModeInit(pScrn, pScrn->currentMode))
return FALSE;
- ARKAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
+ ARKAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
return TRUE;
}
-static void ARKLeaveVT(int scrnIndex, int flags)
+static void ARKLeaveVT(VT_FUNC_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
ARKPtr pARK = ARKPTR(pScrn);
ARKRegPtr old = &pARK->SavedRegs;
vgaHWPtr hwp = VGAHWPTR(pScrn);
@@ -1081,9 +1079,9 @@ static void ARKUnmapMem(ScrnInfoPtr pScrn)
}
-Bool ARKCloseScreen(int scrnIndex, ScreenPtr pScreen)
+Bool ARKCloseScreen(CLOSE_SCREEN_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
ARKPtr pARK = ARKPTR(pScrn);
vgaHWPtr hwp = VGAHWPTR(pScrn);
@@ -1099,7 +1097,7 @@ Bool ARKCloseScreen(int scrnIndex, ScreenPtr pScreen)
/* XXX Shouldn't XAADestroyInfoRec() be called? */
- return (*pScreen->CloseScreen)(scrnIndex, pScreen);
+ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
}
@@ -1109,9 +1107,10 @@ Bool ARKSaveScreen(ScreenPtr pScreen, int mode)
}
-Bool ARKSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+Bool ARKSwitchMode(SWITCH_MODE_ARGS_DECL)
{
- return ARKModeInit(xf86Screens[scrnIndex], mode);
+ SCRN_INFO_PTR(arg);
+ return ARKModeInit(pScrn, mode);
}
@@ -1135,9 +1134,9 @@ static void ARKLoadPalette(ScrnInfoPtr pScrn, int numColors,
}
-static void ARKFreeScreen(int scrnIndex, int flags)
+static void ARKFreeScreen(FREE_SCREEN_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
vgaHWFreeHWRec(pScrn);
diff --git a/src/compat-api.h b/src/compat-api.h
new file mode 100644
index 0000000..6bc946f
--- /dev/null
+++ b/src/compat-api.h
@@ -0,0 +1,99 @@
+/*
+ * 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
+
+#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 VT_FUNC_ARGS_DECL int arg, int flags
+#define VT_FUNC_ARGS pScrn->scrnIndex, 0
+
+#define XF86_SCRN_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 VT_FUNC_ARGS_DECL ScrnInfoPtr arg
+#define VT_FUNC_ARGS pScrn
+
+#define XF86_SCRN_ARG(x) (x)
+
+#endif
+
+#endif
commit 7f115c9df7431e73b558b18aba7b64a1e253bb0a
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 17 13:53:00 2012 +1000
ark: make build against XAA-less server.
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/configure.ac b/configure.ac
index 8d3d470..752ead8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,6 +70,23 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.12.901])
fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+AC_ARG_ENABLE(xaa,
+ AS_HELP_STRING([--enable-xaa],
+ [Enable legacy X Acceleration Architecture (XAA) [default=auto]]),
+ [XAA="$enableval"],
+ [XAA=auto])
+if test "x$XAA" != xno; then
+ save_CFLAGS=$CFLAGS
+ save_CPPFLAGS=$CPPFLAGS
+ CFLAGS=$XORG_CFLAGS
+ CPPFLAGS="$XORG_CFLAGS"
+ AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no)
+ CFLAGS=$save_CFLAGS
+ CPPFLAGS=$save_CPPFLAGS
+fi
+AC_MSG_CHECKING([whether to include XAA support])
+AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
+AC_MSG_RESULT([$XAA])
DRIVER_NAME=ark
AC_SUBST([DRIVER_NAME])
diff --git a/src/ark.h b/src/ark.h
index 7462876..bee8d1a 100644
--- a/src/ark.h
+++ b/src/ark.h
@@ -7,7 +7,9 @@
#include "xf86.h"
#include "xf86Pci.h"
+#ifdef HAVE_XAA_H
#include "xaa.h"
+#endif
#include "vgaHW.h"
#define PCI_VENDOR_ARK 0xEDD8
@@ -46,7 +48,9 @@ typedef struct _ARKRec {
unsigned int Flags;
Bool NoAccel;
CARD32 Bus;
+#ifdef HAVE_XAA_H
XAAInfoRecPtr pXAA;
+#endif
int Chipset, ChipRev;
int clock_mult;
int dac_width;
diff --git a/src/ark_accel.c b/src/ark_accel.c
index 5ab75f0..2ec5070 100644
--- a/src/ark_accel.c
+++ b/src/ark_accel.c
@@ -34,16 +34,14 @@
#include <X11/Xarch.h>
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xaa.h"
#include "compiler.h"
#include "ark.h"
#include "ark_reg.h"
-
+#ifdef HAVE_XAA_H
static int curx, cury, cmd_flags;
-
static void ARKSync(ScrnInfoPtr pScrn)
{
unsigned long port = 0x3cb;
@@ -186,10 +184,11 @@ static void ARKSubsequentScreenToScreenCopy(ScrnInfoPtr pScrn,
BITBLT | cmd_flags);
}
-
+#endif
Bool ARKAccelInit(ScreenPtr pScreen)
{
+#ifdef HAVE_XAA_H
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
ARKPtr pARK = ARKPTR(pScrn);
XAAInfoRecPtr pXAA;
@@ -228,4 +227,7 @@ Bool ARKAccelInit(ScreenPtr pScreen)
LINEAR_DST_ADDR);
return XAAInit(pScreen, pXAA);
+#else
+ return FALSE;
+#endif
}
diff --git a/src/ark_driver.c b/src/ark_driver.c
index cda8cdc..d550f2e 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -37,7 +37,6 @@
#include "xf86fbman.h"
#include "xf86cmap.h"
#include "compiler.h"
-#include "xaa.h"
#include "mipointer.h"
#include "micmap.h"
#include "mibstore.h"
Reply to: