xserver-xorg-video-mach64: Changes to 'upstream-experimental'
README | 20 ++++++++++++++++++++
src/aticlock.c | 4 ----
src/atimach64accel.h | 12 ++++++++++++
src/atimach64xv.c | 4 ++++
src/atipreinit.c | 3 +--
src/atividmem.c | 20 +++++++++++++++-----
6 files changed, 52 insertions(+), 11 deletions(-)
New commits:
commit d394e0b8269ea0a7d36ee8edb38947df170399c9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 30 20:41:43 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
diff --git a/README b/README
new file mode 100644
index 0000000..143816b
--- /dev/null
+++ b/README
@@ -0,0 +1,20 @@
+xf86-video-mach64 - ATI Mach64 driver for the Xorg X server
+
+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-mach64
+
+ http://cgit.freedesktop.org/xorg/driver/xf86-video-mach64
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
commit cab7a47477e3878cb9f1fdc5b721fc8e3aaadd5b
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Nov 28 01:09:52 2008 -0200
Remove xf86{Disable,Enable}Interrupts
They were already a noop in most "os-support"s, and are no longer
available in the X Server.
diff --git a/src/aticlock.c b/src/aticlock.c
index f4de77f..53e28b5 100644
--- a/src/aticlock.c
+++ b/src/aticlock.c
@@ -330,8 +330,6 @@ ATIClockSet
ATIDelay(50000); /* 50 milliseconds */
- (void)xf86DisableInterrupts();
-
/* Send all 20 bits of programme word */
while (Programme >= CLOCK_BIT)
{
@@ -343,8 +341,6 @@ ATIClockSet
Programme >>= 1;
}
- xf86EnableInterrupts();
-
/* Restore register */
out8(CLOCK_CNTL, clock_cntl0 | CLOCK_STROBE);
break;
commit e993728f7ee618d34163c127231881aec1637ca2
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 14:31:13 2008 -0400
Don't print the resource list on failure.
If this ever happens it should be printed from the server at any rate.
diff --git a/src/atipreinit.c b/src/atipreinit.c
index f89f5b7..2b84a6c 100644
--- a/src/atipreinit.c
+++ b/src/atipreinit.c
@@ -561,8 +561,7 @@ ATIPreInit
if (pResources)
{
xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
- "Unable to register the following bus resources:\n");
- xf86PrintResList(0, pResources);
+ "Unable to register bus resources\n");
xf86FreeResList(pResources);
return FALSE;
}
commit 46a0254b5a0bffe8c57322b085bcd38f893e4b27
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Sep 9 10:32:48 2008 -0400
Make sure the screen is a mach64 screen before doing anything in ATIMach64XVInitialiseAdaptor.
diff --git a/src/atimach64xv.c b/src/atimach64xv.c
index ef17861..21cd890 100644
--- a/src/atimach64xv.c
+++ b/src/atimach64xv.c
@@ -31,6 +31,7 @@
#include "atimach64accel.h"
#include "atimach64io.h"
#include "atixv.h"
+#include "atimach64version.h"
#include <X11/extensions/Xv.h>
#include "fourcc.h"
@@ -1358,6 +1359,9 @@ ATIMach64XVInitialiseAdaptor
XF86OffscreenImagePtr surf0 = &(ATIMach64Surface[0]);
XF86OffscreenImagePtr surf1 = &(ATIMach64Surface[1]);
+ if (xf86NameCmp(pScreenInfo->driverName, MACH64_DRIVER_NAME) != 0)
+ return 0;
+
if (pppAdaptor)
*pppAdaptor = NULL;
commit 89a9ad75f3e50e25275b803617d5e74709ead269
Author: Yi Zhan <yi.zhan@intel.com>
Date: Wed Mar 26 16:13:08 2008 +1000
mach64: on IA64 systems the pciaccess page size mapping was getting E2BIG
As the ia64 pagesize was 16k, and aperture was only 4k, this was messing up
on ia64 machines.
Modified fix from RH BZ 438947 - airlied
diff --git a/src/atividmem.c b/src/atividmem.c
index 986ac0f..8950f84 100644
--- a/src/atividmem.c
+++ b/src/atividmem.c
@@ -146,7 +146,12 @@ ATIUnmapMMIO
#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(iScreen, pATI->pMMIO, getpagesize());
#else
- pci_device_unmap_range(pATI->PCIInfo, pATI->pMMIO, getpagesize());
+ unsigned long size;
+
+ size = PCI_REGION_SIZE(pATI->PCIInfo, 2);
+ if (!size || size > getpagesize())
+ size = getpagesize();
+ pci_device_unmap_range(pATI->PCIInfo, pATI->pMMIO, size);
#endif
}
@@ -340,10 +345,15 @@ ATIMapApertures
int mode = PCI_DEV_MAP_FLAG_WRITABLE;
- int err = pci_device_map_range(pVideo,
- MMIOBase,
- PageSize,
- mode, &pATI->pMMIO);
+ int err;
+ int size;
+
+ size = PCI_REGION_SIZE(pVideo, 2);
+ if (!size || size > PageSize)
+ size = PageSize;
+
+ err = pci_device_map_range(pVideo, MMIOBase,
+ size, mode, &pATI->pMMIO);
if (err)
{
commit 6127349c9625ae3b50c40fd3641847be3ca18795
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Mar 19 17:42:23 2008 -0400
[PATCH] Compile warning fixes.
Add missing prototypes to atimach64accel.h.
diff --git a/src/atimach64accel.h b/src/atimach64accel.h
index 6a7d5b2..a8585d5 100644
--- a/src/atimach64accel.h
+++ b/src/atimach64accel.h
@@ -39,4 +39,16 @@ extern Bool ATIMach64AccelInit(ScreenPtr);
#endif
extern void ATIMach64Sync(ScrnInfoPtr);
+/* atimach64accel.c */
+extern void ATIMach64ValidateClip(ATIPtr, int, int, int, int);
+
+#ifdef USE_EXA
+/* atimach64render.c */
+extern Bool Mach64CheckComposite(int, PicturePtr, PicturePtr, PicturePtr);
+extern Bool Mach64PrepareComposite(int, PicturePtr, PicturePtr, PicturePtr,
+ PixmapPtr, PixmapPtr, PixmapPtr);
+extern void Mach64Composite(PixmapPtr, int, int, int, int, int, int, int, int);
+extern void Mach64DoneComposite(PixmapPtr);
+#endif
+
#endif /* ___ATIMACH64ACCEL_H___ */
Reply to: