xserver-xorg-video-mga: Changes to 'debian-unstable'
ChangeLog | 110 ++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 22 +++++++--
debian/changelog | 11 ++++
debian/control | 2
debian/rules | 3 +
src/Makefile.am | 9 ++-
src/compat-api.h | 99 +++++++++++++++++++++++++++++++++++++++++
src/mga.h | 64 +++++++++++++++-----------
src/mga_arc.c | 2
src/mga_bios.c | 3 -
src/mga_dac3026.c | 3 -
src/mga_dacG.c | 5 --
src/mga_dga.c | 24 ++++++----
src/mga_dh.c | 3 -
src/mga_dri.c | 33 ++++++-------
src/mga_driver.c | 129 ++++++++++++++++++++++--------------------------------
src/mga_exa.c | 11 ++--
src/mga_g450pll.c | 3 -
src/mga_hwcurs.c | 3 -
src/mga_merge.c | 63 ++++++++++++--------------
src/mga_merge.h | 6 +-
src/mga_shadow.c | 7 +-
src/mga_storm.c | 31 ++++++++++--
src/mga_video.c | 21 ++++----
24 files changed, 448 insertions(+), 219 deletions(-)
New commits:
commit f3eb9d276eee3847728d745aa6afc827546fb48e
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Sep 16 23:15:49 2013 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index e9a1881..1bbc780 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-mga (1:1.6.2-1) UNRELEASED; urgency=low
+xserver-xorg-video-mga (1:1.6.2-1) unstable; urgency=low
[ Maarten Lankhorst ]
* New upstream release
@@ -7,7 +7,7 @@ xserver-xorg-video-mga (1:1.6.2-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Disable silent build rules.
- -- Maarten Lankhorst <maarten.lankhorst@canonical.com> Wed, 18 Jul 2012 14:33:10 +0200
+ -- Julien Cristau <jcristau@debian.org> Mon, 16 Sep 2013 23:15:39 +0200
xserver-xorg-video-mga (1:1.5.0-3) unstable; urgency=medium
commit f6eaa8d0b34b9dd7b8c2c9dc5828196a857234f4
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Sep 16 23:14:03 2013 +0200
Disable silent build rules.
diff --git a/debian/changelog b/debian/changelog
index 154aa77..e9a1881 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
xserver-xorg-video-mga (1:1.6.2-1) UNRELEASED; urgency=low
+ [ Maarten Lankhorst ]
* New upstream release
* Bump Standards-Version to 3.9.3 (no changes needed).
+ [ Julien Cristau ]
+ * Disable silent build rules.
+
-- Maarten Lankhorst <maarten.lankhorst@canonical.com> Wed, 18 Jul 2012 14:33:10 +0200
xserver-xorg-video-mga (1:1.5.0-3) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 3d192dc..496a59a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,8 @@
#!/usr/bin/make -f
+override_dh_auto_configure:
+ dh_auto_configure -- --disable-silent-rules
+
# Install in debian/tmp to retain control through dh_install:
override_dh_auto_install:
dh_auto_install --destdir=debian/tmp
commit 3eace93f42c365ee3b561aa47e50653edca2755f
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Mon Oct 1 12:35:09 2012 +0300
update the changelogs
diff --git a/ChangeLog b/ChangeLog
index ae101dc..d806b51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+commit fcd27b2b4ab2a181d5263296e71cda2d8772ba2d
+Author: Dave Airlie <airlied@redhat.com>
+Date: Fri Sep 28 11:36:44 2012 +1000
+
+ mga: bump release to 1.6.2
+
+commit 29de36da0ed031815bd302f55f2ef5cc0cce6cc6
+Author: Dave Airlie <airlied@redhat.com>
+Date: Fri Sep 28 10:54:00 2012 +1000
+
+ mga: bring dri1 back to life.
+
+ we need to at least setup the memory manager bits so dri1 clients
+ get a backbuffer. this at least gets gears working again without XAA.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit e777a2845bfeefad386db35d694e4b1cd74a0dd5
+Author: Dave Airlie <airlied@redhat.com>
+Date: Wed Sep 26 15:18:44 2012 +1000
+
+ mga: add stub storm functions if not using XAA
+
+ If we aren't using XAA just add stub storm init/sync functions.
+
+ This lets the driver load yay.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 220e06fefe77175d9827954e61549eadda245d9a
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Sep 25 08:54:42 2012 -0400
+
+ Remove mibstore.h
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
commit cd41eacaeabf8227197d605b055713ca654633d5
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 17 16:05:09 2012 +1000
diff --git a/debian/changelog b/debian/changelog
index 81bb0dd..1bb8207 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-mga (1:1.6.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-mga (1:1.6.2-1) UNRELEASED; urgency=low
* New upstream release
* Bump Standards-Version to 3.9.3 (no changes needed).
commit fcd27b2b4ab2a181d5263296e71cda2d8772ba2d
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Sep 28 11:36:44 2012 +1000
mga: bump release to 1.6.2
diff --git a/configure.ac b/configure.ac
index 1b6c20f..fca1a9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-mga],
- [1.6.1],
+ [1.6.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-mga])
AC_CONFIG_SRCDIR([Makefile.am])
commit 29de36da0ed031815bd302f55f2ef5cc0cce6cc6
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Sep 28 10:54:00 2012 +1000
mga: bring dri1 back to life.
we need to at least setup the memory manager bits so dri1 clients
get a backbuffer. this at least gets gears working again without XAA.
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index 79745d1..8227c05 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,6 +55,7 @@ mga_drv_la_SOURCES = \
mga_ucode.h \
mga_vga.c \
mga_video.c \
+ mga_storm.c \
compat-api.h
if DRI
@@ -71,6 +72,5 @@ endif
if XAA
mga_drv_la_SOURCES += \
- mga_arc.c \
- mga_storm.c
+ mga_arc.c
endif
diff --git a/src/mga_dri.c b/src/mga_dri.c
index 0154671..3923c04 100644
--- a/src/mga_dri.c
+++ b/src/mga_dri.c
@@ -922,13 +922,11 @@ static void MGADRIInitBuffersXAA(WindowPtr pWin, RegionPtr prgn,
}
#endif
-#ifdef USE_EXA
static void MGADRIInitBuffersEXA(WindowPtr pWin, RegionPtr prgn,
CARD32 index)
{
/* FIXME */
}
-#endif
#ifdef USE_XAA
/*
@@ -1078,13 +1076,11 @@ static void MGADRIMoveBuffersXAA(WindowPtr pParent, DDXPointRec ptOldOrg,
}
#endif
-#ifdef USE_EXA
static void MGADRIMoveBuffersEXA(WindowPtr pParent, DDXPointRec ptOldOrg,
RegionPtr prgnSrc, CARD32 index)
{
/* FIXME */
}
-#endif
Bool MGADRIScreenInit( ScreenPtr pScreen )
{
@@ -1231,6 +1227,8 @@ Bool MGADRIScreenInit( ScreenPtr pScreen )
pDRIInfo->SwapContext = MGADRISwapContext;
}
+ pDRIInfo->InitBuffers = MGADRIInitBuffersEXA;
+ pDRIInfo->MoveBuffers = MGADRIMoveBuffersEXA;
#ifdef USE_EXA
if (pMga->Exa) {
pDRIInfo->InitBuffers = MGADRIInitBuffersEXA;
diff --git a/src/mga_driver.c b/src/mga_driver.c
index 3db3a74..8c4bb9c 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -3398,11 +3398,7 @@ MGAScreenInit(SCREEN_INIT_ARGS_DECL)
mgaExaInit(pScreen);
else
#endif
-#ifdef XAA
MGAStormAccelInit(pScreen);
-#else
- ;
-#endif
}
xf86SetBackingStore(pScreen);
@@ -4184,14 +4180,3 @@ MGAG100BlackMagic(ScrnInfoPtr pScrn)
OUTREG(MGAREG_MACCESS, 1<<15);
usleep(10);
}
-
-#ifndef HAVE_XAA_H
-void MGAStormEngineInit( ScrnInfoPtr pScrn )
-{
-}
-
-void
-MGAStormSync(ScrnInfoPtr pScrn)
-{
-}
-#endif
diff --git a/src/mga_storm.c b/src/mga_storm.c
index c32caf4..fb0e7be 100644
--- a/src/mga_storm.c
+++ b/src/mga_storm.c
@@ -15,8 +15,10 @@
#include "xf86Pci.h"
/* Drivers that use XAA need this */
+#ifdef HAVE_XAA_H
#include "xaa.h"
#include "xaalocal.h"
+#endif
#include "xf86fbman.h"
#include "miline.h"
#include "servermd.h"
@@ -59,6 +61,7 @@ do { \
XAAMoveDWORDS((d),(s),(c)); \
} while (0)
+#ifdef HAVE_XAA_H
static void mgaSetupForSolidFill( ScrnInfoPtr pScrn, int color,
int rop, unsigned int planemask );
@@ -569,10 +572,13 @@ MGASubsequentCPUToScreenTexture (
#endif /* defined(RENDER) */
+#endif
Bool mgaAccelInit( ScreenPtr pScreen )
{
+#ifdef HAVE_XAA_H
XAAInfoRecPtr infoPtr;
+#endif
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
MGAPtr pMga = MGAPTR(pScrn);
int maxFastBlitMem, maxlines;
@@ -583,8 +589,10 @@ Bool mgaAccelInit( ScreenPtr pScreen )
pMga->ScratchBuffer = malloc(((pScrn->displayWidth * pMga->CurrentLayout.bitsPerPixel) + 127) >> 3);
if(!pMga->ScratchBuffer) return FALSE;
+#ifdef HAVE_XAA_H
pMga->AccelInfoRec = infoPtr = XAACreateInfoRec();
if(!infoPtr) return FALSE;
+#endif
pMga->RenderTime = 0;
pMga->LinearScratch = 0;
@@ -617,6 +625,7 @@ Bool mgaAccelInit( ScreenPtr pScreen )
pMga->AtypeNoBLK = MGAAtypeNoBLK;
}
+#ifdef HAVE_XAA_H
/* fill out infoPtr here */
infoPtr->Flags = PIXMAP_CACHE |
OFFSCREEN_PIXMAPS |
@@ -782,6 +791,8 @@ Bool mgaAccelInit( ScreenPtr pScreen )
pMga->MaxFastBlitY = maxFastBlitMem / (pScrn->displayWidth * pMga->CurrentLayout.bitsPerPixel / 8);
}
+#endif
+
switch (pMga->Chipset) {
case PCI_CHIP_MGAG200_SE_A_PCI:
case PCI_CHIP_MGAG200_SE_B_PCI:
@@ -917,6 +928,7 @@ Bool mgaAccelInit( ScreenPtr pScreen )
}
+#ifdef HAVE_XAA_H
for (i = 0; i < pScrn->numEntities; i++) {
if (xf86IsEntityShared(pScrn->entityList[i])) {
infoPtr->RestoreAccelState = mgaRestoreAccelState;
@@ -949,9 +961,13 @@ Bool mgaAccelInit( ScreenPtr pScreen )
#endif /* defined(RENDER) */
return(XAAInit(pScreen, infoPtr));
+#else
+ return TRUE;
+#endif
}
+#ifdef HAVE_XAA_H
/* Support for multiscreen */
static void mgaRestoreAccelState(ScrnInfoPtr pScrn)
{
@@ -994,7 +1010,7 @@ static void mgaRestoreAccelState(ScrnInfoPtr pScrn)
OUTREG(MGAREG_YBOT, 0x007FFFFF); /* maxPixelPointer */
pMga->AccelFlags &= ~CLIPPER_ON;
}
-
+#endif
CARD32 MGAAtype[16] = {
MGADWG_RPL | 0x00000000, MGADWG_RSTR | 0x00080000,
@@ -1080,9 +1096,11 @@ void MGAStormEngineInit( ScrnInfoPtr pScrn )
opmode &= ~0x30000;
#endif
+#ifdef HAVE_XAA_H
pMga->SetupForSolidFill = mgaSetupForSolidFill;
pMga->SubsequentSolidFillRect = mgaSubsequentSolidFillRect;
pMga->RestoreAccelState = mgaRestoreAccelState;
+#endif
pMga->fifoCount = 0;
@@ -1155,6 +1173,7 @@ void MGAStormEngineInit( ScrnInfoPtr pScrn )
}
+#ifdef HAVE_XAA_H
static void
MGASetClippingRectangle(
ScrnInfoPtr pScrn,
@@ -2534,3 +2553,4 @@ MGAFillCacheBltRects(
SET_SYNC_FLAG(infoRec);
}
+#endif
commit 7924cd3004ef2f28b5fe97c7175c2581b72ab105
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Sep 26 11:24:10 2012 +0300
fix the version
diff --git a/debian/changelog b/debian/changelog
index ca43f6b..81bb0dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-mga (1:1.6.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-mga (1:1.6.1-1) UNRELEASED; urgency=low
* New upstream release
* Bump Standards-Version to 3.9.3 (no changes needed).
commit e777a2845bfeefad386db35d694e4b1cd74a0dd5
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Sep 26 15:18:44 2012 +1000
mga: add stub storm functions if not using XAA
If we aren't using XAA just add stub storm init/sync functions.
This lets the driver load yay.
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/src/mga_driver.c b/src/mga_driver.c
index f4f54a1..3db3a74 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -4185,3 +4185,13 @@ MGAG100BlackMagic(ScrnInfoPtr pScrn)
usleep(10);
}
+#ifndef HAVE_XAA_H
+void MGAStormEngineInit( ScrnInfoPtr pScrn )
+{
+}
+
+void
+MGAStormSync(ScrnInfoPtr pScrn)
+{
+}
+#endif
commit 220e06fefe77175d9827954e61549eadda245d9a
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 25 08:54:42 2012 -0400
Remove mibstore.h
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/mga_driver.c b/src/mga_driver.c
index b3fe538..f4f54a1 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -73,9 +73,6 @@
/* All drivers initialising the SW cursor need this */
#include "mipointer.h"
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
-
#include "micmap.h"
#include "xf86DDC.h"
@@ -3408,7 +3405,6 @@ MGAScreenInit(SCREEN_INIT_ARGS_DECL)
#endif
}
- miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
xf86SetSilkenMouse(pScreen);
commit a08b53521d69acf9f7d9833385bb2bc4818fc056
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 18 14:36:09 2012 +0200
Bump Standards-Version to 3.9.3 (no changes needed).
diff --git a/debian/changelog b/debian/changelog
index d34c6ea..ca43f6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-mga (1:1.6.0-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 14:33:10 +0200
diff --git a/debian/control b/debian/control
index 539353e..d833c29 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends:
x11proto-xf86dri-dev,
quilt,
xutils-dev (>= 1:7.5+4)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-mga
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-mga.git
commit cc980e5a84fd63a3546769f34ffeb63058fff123
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 18 14:34:13 2012 +0200
New upstream release
diff --git a/debian/changelog b/debian/changelog
index c599f7b..d34c6ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-mga (1:1.6.0-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Maarten Lankhorst <maarten.lankhorst@canonical.com> Wed, 18 Jul 2012 14:33:10 +0200
+
xserver-xorg-video-mga (1:1.5.0-2) unstable; urgency=low
* mga: don't bind to device if there is a kernel driver, to avoid conflicts
commit 10b0f1e596e07aeee9d51a6b235e91db7c37ebae
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 18 14:34:02 2012 +0200
Bump changelog
diff --git a/ChangeLog b/ChangeLog
index fbba476..ae101dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,76 @@
+commit cd41eacaeabf8227197d605b055713ca654633d5
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 17 16:05:09 2012 +1000
+
+ xf86-video-mga: bump to version 1.6.1
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit f11a407ceb0857bb0d33811511117b490a8ae6ee
+Author: Dave Airlie <airlied@gmail.com>
+Date: Sun Jul 15 19:41:28 2012 +1000
+
+ mga: fix after XAA removal
+
+ Fix mga build after XAA removal.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit fa0f3092ed38ce71ba9f65156bde306eb63feaf8
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon Jul 2 12:08:05 2012 +0100
+
+ mga: bump to 1.6.0
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 7b6dcc4d5768cc8d17a1f664155ebdc8ca8c042e
+Author: Dave Airlie <airlied@redhat.com>
+Date: Wed Jun 6 09:23:31 2012 +0100
+
+ mga: port to new compat API.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 0cb8ba6dc5e7bf4179174f9f17e211df7d89bd41
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed May 23 23:40:32 2012 -0700
+
+ Add const qualifier to char *from in MGAdoDDC
+
+ Only used to store arguments to pass as printf %s strings to xf86DrvMsg
+
+ Fixes gcc warnings:
+ mga_driver.c: In function 'MGAdoDDC':
+ mga_driver.c:1338:7: warning: assignment discards qualifiers from pointer target type
+ mga_driver.c:1343:11: warning: assignment discards qualifiers from pointer target type
+ mga_driver.c:1351:8: warning: assignment discards qualifiers from pointer target type
+ mga_driver.c:1359:8: warning: assignment discards qualifiers from pointer target type
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+
+commit 3d9631b819c5c6f64ebf9bda8aab93e1cc7f391f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed May 23 23:34:07 2012 -0700
+
+ Move PCI vendor/device id defines into mga.h instead of using xf86PciInfo.h
+
+ Silences deprecation warnings from xf86PciInfo.h in current Xorg servers
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+
+commit 0af7dba78559ce82b4c3eed0862415efcde51863
+Author: Dave Airlie <airlied@redhat.com>
+Date: Thu May 17 10:19:21 2012 +0100
+
+ mga: don't bind to device if there is a kernel driver
+
+ this should only pick up KMS drivers and not old drm drivers.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
commit 3991971c23ebe596742c004b1e583dfb1aa14ec4
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Mar 23 19:02:40 2012 -0700
commit cd41eacaeabf8227197d605b055713ca654633d5
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 17 16:05:09 2012 +1000
xf86-video-mga: bump to version 1.6.1
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/configure.ac b/configure.ac
index cc2498e..1b6c20f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-mga],
- [1.6.0],
+ [1.6.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-mga])
AC_CONFIG_SRCDIR([Makefile.am])
commit f11a407ceb0857bb0d33811511117b490a8ae6ee
Author: Dave Airlie <airlied@gmail.com>
Date: Sun Jul 15 19:41:28 2012 +1000
mga: fix after XAA removal
Fix mga build after XAA removal.
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/configure.ac b/configure.ac
index fd870b8..cc2498e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,8 +126,24 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
-AM_CONDITIONAL(USE_XAA, true)
-AC_DEFINE(USE_XAA, 1, [Build support for XAA])
+
+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])
# Properly handle EXA.
AC_MSG_CHECKING([whether to enable EXA support])
diff --git a/src/Makefile.am b/src/Makefile.am
index 46f0265..79745d1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,7 +32,6 @@ mga_drv_la_LIBADD = $(noinst_LTLIBRARIES)
mga_drv_la_SOURCES = \
binding.h \
client.h \
- mga_arc.c \
mga_bios.c \
mga_common.h \
mga_dac3026.c \
@@ -70,7 +69,8 @@ mga_drv_la_SOURCES += \
mga_exa.c
endif
-if USE_XAA
+if XAA
mga_drv_la_SOURCES += \
+ mga_arc.c \
mga_storm.c
endif
diff --git a/src/mga.h b/src/mga.h
index 5856a3f..34695c1 100644
--- a/src/mga.h
+++ b/src/mga.h
@@ -20,7 +20,10 @@
#include <stdio.h>
#include "compiler.h"
+#ifdef HAVE_XAA_H
#include "xaa.h"
+#endif
+#include "xf86fbman.h"
#include "exa.h"
#include "xf86Cursor.h"
#include "vgaHW.h"
@@ -554,7 +557,9 @@ typedef struct {
CARD32 MAccess;
int FifoSize;
int StyleLen;
+#ifdef HAVE_XAA_H
XAAInfoRecPtr AccelInfoRec;
+#endif
xf86CursorInfoPtr CursorInfoRec;
DGAModePtr DGAModes;
int numDGAModes;
@@ -715,7 +720,7 @@ void MGAAdjustGranularity(ScrnInfoPtr pScrn, int* x, int* y);
void MGA2064SetupFuncs(ScrnInfoPtr pScrn);
void MGAGSetupFuncs(ScrnInfoPtr pScrn);
-/* #ifdef USE_XAA */
+/*#ifdef USE_XAA */
void MGAStormSync(ScrnInfoPtr pScrn);
void MGAStormEngineInit(ScrnInfoPtr pScrn);
Bool MGAStormAccelInit(ScreenPtr pScreen);
diff --git a/src/mga_arc.c b/src/mga_arc.c
index 5263f1f..61ade3b 100644
--- a/src/mga_arc.c
+++ b/src/mga_arc.c
@@ -39,8 +39,10 @@ in this Software without prior written authorization from The Open Group.
#include "mizerarc.h"
#include "mi.h"
#include "scrnintstr.h"
+#ifdef HAVE_XAA_H
#include "xaa.h"
#include "xaalocal.h"
+#endif
#include "xf86.h"
#include "xf86_OSproc.h"
diff --git a/src/mga_dga.c b/src/mga_dga.c
index a806eb2..ef03688 100644
--- a/src/mga_dga.c
+++ b/src/mga_dga.c
@@ -5,8 +5,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Pci.h"
-#include "xaa.h"
-#include "xaalocal.h"
#include "mga.h"
#include "mga_reg.h"
#include "dgaproc.h"
@@ -17,10 +15,12 @@ static Bool MGA_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **,
static Bool MGA_SetMode(ScrnInfoPtr, DGAModePtr);
static int MGA_GetViewport(ScrnInfoPtr);
static void MGA_SetViewport(ScrnInfoPtr, int, int, int);
+#ifdef HAVE_XAA_H
static void MGA_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
static void MGA_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
static void MGA_BlitTransRect(ScrnInfoPtr, int, int, int, int, int, int,
unsigned long);
+#endif
static
DGAFunctionRec MGA_DGAFuncs = {
@@ -30,9 +30,13 @@ DGAFunctionRec MGA_DGAFuncs = {
MGA_SetViewport,
MGA_GetViewport,
MGAStormSync,
+#ifdef HAVE_XAA_H
MGA_FillRect,
MGA_BlitRect,
MGA_BlitTransRect
+#else
+ NULL, NULL, NULL
+#endif
};
@@ -120,11 +124,13 @@ SECOND_PASS:
mode->flags = DGA_CONCURRENT_ACCESS;
if(pixmap)
mode->flags |= DGA_PIXMAP_AVAILABLE;
+#ifdef HAVE_XAA_H
if(!pMga->NoAccel) {
mode->flags |= DGA_FILL_RECT | DGA_BLIT_RECT;
if((Bpp != 3) && (pMga->Chipset != PCI_CHIP_MGA2064))
mode->flags |= DGA_BLIT_RECT_TRANS;
}
+#endif
if(pMode->Flags & V_DBLSCAN)
mode->flags |= DGA_DOUBLESCAN;
if(pMode->Flags & V_INTERLACE)
@@ -359,6 +365,7 @@ MGA_SetViewport(
pMga->DGAViewportStatus = 0; /* MGAAdjustFrame loops until finished */
}
+#ifdef HAVE_XAA_H
static void
MGA_FillRect (
ScrnInfoPtr pScrn,
@@ -424,7 +431,7 @@ static void MGA_BlitTransRect( ScrnInfoPtr pScrn, int srcx, int srcy,
SET_SYNC_FLAG(pMga->AccelInfoRec);
}
}
-
+#endif
static Bool
MGA_OpenFramebuffer(
diff --git a/src/mga_dri.c b/src/mga_dri.c
index c517322..0154671 100644
--- a/src/mga_dri.c
+++ b/src/mga_dri.c
@@ -355,7 +355,7 @@ void MGAGetQuiescence( ScrnInfoPtr pScrn )
MGAWaitForIdleDMA( pScrn );
/* FIXME what about EXA? */
-#ifdef USE_XAA
+#ifdef XAA
if (!pMga->Exa && pMga->AccelInfoRec) {
WAITFIFO( 11 );
OUTREG( MGAREG_MACCESS, pMga->MAccess );
diff --git a/src/mga_driver.c b/src/mga_driver.c
index e50d77b..b3fe538 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -90,7 +90,7 @@
#include "mga_macros.h"
#include "mga_maven.h"
-#ifdef USE_XAA
+#ifdef XAA
#include "xaa.h"
#endif
@@ -2118,7 +2118,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
}
} else {
#endif
-#ifdef USE_XAA
+#ifdef XAA
if (!xf86LoadSubModule(pScrn, "xaa")) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Falling back to shadowfb\n");
@@ -3401,8 +3401,10 @@ MGAScreenInit(SCREEN_INIT_ARGS_DECL)
mgaExaInit(pScreen);
else
#endif
-#ifdef USE_XAA
+#ifdef XAA
MGAStormAccelInit(pScreen);
+#else
+ ;
#endif
}
@@ -3771,7 +3773,7 @@ MGACloseScreen(CLOSE_SCREEN_ARGS_DECL)
pMgaEnt->refCount--;
}
-#ifdef USE_XAA
+#ifdef XAA
if (pMga->AccelInfoRec)
XAADestroyInfoRec(pMga->AccelInfoRec);
#endif
diff --git a/src/mga_video.c b/src/mga_video.c
index 00e026d..535e329 100644
--- a/src/mga_video.c
+++ b/src/mga_video.c
@@ -14,7 +14,6 @@
#include "mga_macros.h"
#include "xf86xv.h"
#include <X11/extensions/Xv.h>
-#include "xaa.h"
#ifdef USE_XAA
#include "xaa.h"
@@ -1987,9 +1986,11 @@ MGAPutImageILOAD(
bpp = pScrn->bitsPerPixel >> 3;
+#ifdef HAVE_XAA_H
if( pMga->AccelInfoRec->NeedToSync && ((long)data != pPriv->lastPort) ) {
MGAStormSync(pScrn);
}
+#endif
pPriv->lastPort = (long)data;
nbox=REGION_NUM_RECTS(clipBoxes);
@@ -2019,8 +2020,9 @@ MGAPutImageILOAD(
pbox++;
}
-
+#ifdef HAVE_XAA_H
pMga->AccelInfoRec->NeedToSync = TRUE;
+#endif
pPriv->videoStatus = FREE_TIMER;
pPriv->freeTime = currentTime.milliseconds + FREE_DELAY;
pMga->VideoTimerCallback = MGAVideoTimerCallback;
commit fa0f3092ed38ce71ba9f65156bde306eb63feaf8
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jul 2 12:08:05 2012 +0100
mga: bump to 1.6.0
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/configure.ac b/configure.ac
index 933500d..fd870b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-mga],
- [1.5.0],
+ [1.6.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-mga])
AC_CONFIG_SRCDIR([Makefile.am])
commit 7b6dcc4d5768cc8d17a1f664155ebdc8ca8c042e
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jun 6 09:23:31 2012 +0100
mga: port to new compat API.
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index 44417de..46f0265 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,7 +55,8 @@ mga_drv_la_SOURCES = \
mga_shadow.c \
mga_ucode.h \
mga_vga.c \
- mga_video.c
+ mga_video.c \
+ compat-api.h
if DRI
mga_drv_la_SOURCES += \
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
Reply to: