ChangeLog | 37 +++++++++++++++++++++++++++++++++
configure.ac | 2 -
debian/changelog | 21 ++++++++++++------
debian/patches/fix-driver-loading.diff | 30 --------------------------
debian/patches/series | 1
src/Makefile.am | 4 +--
src/mga_dri.c | 6 +----
src/mga_driver.c | 9 --------
src/mga_storm.c | 22 ++++++++++++++++++-
9 files changed, 77 insertions(+), 55 deletions(-)
New commits:
commit 53cd649d5262338f0d3146a2ba60f7e4fcd6ec56
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Mon Oct 1 12:37:53 2012 +0300
Merge from unreleased debian git.
* Merge from unreleased debian git.
* Drop fix-driver-load.diff, upstream.
diff --git a/debian/changelog b/debian/changelog
index d2083cb..5b80268 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-mga (1:1.6.2-0ubuntu1) quantal; urgency=low
+
+ * Merge from unreleased debian git.
+ * Drop fix-driver-load.diff, upstream.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Mon, 01 Oct 2012 12:36:54 +0300
+
xserver-xorg-video-mga (1:1.6.2-1) UNRELEASED; urgency=low
* New upstream release
diff --git a/debian/patches/fix-driver-loading.diff
b/debian/patches/fix-driver-loading.diff
deleted file mode 100644
index b1e1004..0000000
--- a/debian/patches/fix-driver-loading.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-commit e777a2845bfeefad386db35d694e4b1cd74a0dd5
-Author: Dave Airlie <airl...@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 <airl...@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
diff --git a/debian/patches/series b/debian/patches/series
index 6abb0c5..7b69d6a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
01_no_nonfree.diff
02_tentatively_unbreak_dual_head.diff
-fix-driver-loading.diff
commit 3eace93f42c365ee3b561aa47e50653edca2755f
Author: Timo Aaltonen <tjaal...@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 <airl...@redhat.com>
+Date: Fri Sep 28 11:36:44 2012 +1000
+
+ mga: bump release to 1.6.2
+
+commit 29de36da0ed031815bd302f55f2ef5cc0cce6cc6
+Author: Dave Airlie <airl...@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 <airl...@redhat.com>
+
+commit e777a2845bfeefad386db35d694e4b1cd74a0dd5
+Author: Dave Airlie <airl...@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 <airl...@redhat.com>
+
+commit 220e06fefe77175d9827954e61549eadda245d9a
+Author: Adam Jackson <a...@redhat.com>
+Date: Tue Sep 25 08:54:42 2012 -0400
+
+ Remove mibstore.h
+
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+
commit cd41eacaeabf8227197d605b055713ca654633d5
Author: Dave Airlie <airl...@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 <airl...@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 <airl...@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 <airl...@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 e777a2845bfeefad386db35d694e4b1cd74a0dd5
Author: Dave Airlie <airl...@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 <airl...@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 <a...@redhat.com>
Date: Tue Sep 25 08:54:42 2012 -0400
Remove mibstore.h
Signed-off-by: Adam Jackson <a...@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);
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ticsv-00059s...@vasks.debian.org
