Bug#594684: Refreshed patch
Hi,
Attached is a refreshed patch that applies against xorg-server 2:1.11.0-1.
--
Matt Kraai
https://ftbfs.org/kraai
Index: xorg-server-1.11.0/hw/xfree86/dri/sarea.h
===================================================================
--- xorg-server-1.11.0.orig/hw/xfree86/dri/sarea.h 2010-06-05 18:16:50.000000000 -0700
+++ xorg-server-1.11.0/hw/xfree86/dri/sarea.h 2011-09-09 05:50:14.500002499 -0700
@@ -42,6 +42,8 @@
/* SAREA area needs to be at least a page */
#if defined(__alpha__)
#define SAREA_MAX 0x2000
+#elif defined(__mips__)
+#define SAREA_MAX 0x4000
#elif defined(__ia64__)
#define SAREA_MAX 0x10000 /* 64kB */
#else
Index: xorg-server-1.11.0/hw/xfree86/os-support/linux/lnx_video.c
===================================================================
--- xorg-server-1.11.0.orig/hw/xfree86/os-support/linux/lnx_video.c 2011-01-03 10:05:41.000000000 -0800
+++ xorg-server-1.11.0/hw/xfree86/os-support/linux/lnx_video.c 2011-09-09 06:01:07.988002615 -0700
@@ -493,9 +493,10 @@
Bool
xf86EnableIO(void)
{
-#if defined(__powerpc__)
+#if defined(__powerpc__) || defined(__mips__)
int fd;
unsigned int ioBase_phys;
+ extern unsigned int IOPortBase;
#endif
if (ExtendedEnabled)
@@ -520,7 +521,22 @@
#endif
}
close(fd);
-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__)
+#elif defined(__mips__)
+ fd = open("/dev/mem", O_RDWR);
+ IOPortBase = (volatile unsigned char *)mmap(0, 0x20000,
+ PROT_READ | PROT_WRITE, MAP_SHARED, fd,
+ 0x1fd00000);
+ if (IOPortBase == MAP_FAILED) {
+ xf86Msg(X_WARNING,
+ "xf86EnableIOPorts: Failed to map iobase (%s)\n",
+ strerror(errno));
+ return FALSE;
+ }
+ close(fd);
+ xf86Msg(X_WARNING,
+ "xf86EnableIOPorts: map iobase (%x)\n",
+ IOPortBase);
+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__)
if (ioperm(0, 1024, 1) || iopl(3)) {
if (errno == ENODEV)
ErrorF("xf86EnableIOPorts: no I/O ports found\n");
Reply to: