diff options
| author |   Zhang Le <r0bertz@gentoo.org> | 2010-02-27 13:46:13 +0800 |
|---|---|---|
| committer | Zhang Le <r0bertz@gentoo.org> | 2010-02-27 13:46:13 +0800 |
| commit | 4810f82e078a1b0d4f3aecadedae70729419e0de (patch) | |
| tree | 329e52b6d5d342b775bb92553e7832dc85268f4a /x11-base/xorg-server/files/xorg-server-1.7.5-loongson.patch | |
| parent | Merge branch 'master' of ssh://192.168.1.101/var/git/loongson (diff) | |
| download | loongson-4810f82e078a1b0d4f3aecadedae70729419e0de.tar.gz loongson-4810f82e078a1b0d4f3aecadedae70729419e0de.tar.bz2 loongson-4810f82e078a1b0d4f3aecadedae70729419e0de.zip | |
added xorg-server-1.7.5.ebuild and smi 16bpp workaround patch and clean up
Signed-off-by: Zhang Le <r0bertz@gentoo.org>
Diffstat (limited to 'x11-base/xorg-server/files/xorg-server-1.7.5-loongson.patch')
| -rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.7.5-loongson.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/x11-base/xorg-server/files/xorg-server-1.7.5-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.7.5-loongson.patch new file mode 100644 index 0000000..4351f28 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.7.5-loongson.patch @@ -0,0 +1,53 @@ +diff --git a/hw/xfree86/dri/sarea.h b/hw/xfree86/dri/sarea.h +index 1528cc1..6be12b9 100644 +--- a/hw/xfree86/dri/sarea.h ++++ b/hw/xfree86/dri/sarea.h +@@ -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 +diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c +index 688106a..1552860 100644 +--- a/hw/xfree86/os-support/linux/lnx_video.c ++++ b/hw/xfree86/os-support/linux/lnx_video.c +@@ -505,9 +505,10 @@ _X_EXPORT volatile unsigned char *ioBase = NULL; + _X_EXPORT Bool + xf86EnableIO(void) + { +-#if defined(__powerpc__) ++#if defined(__powerpc__) || defined(__mips__) + int fd; + unsigned int ioBase_phys; ++ extern unsigned int IOPortBase; + #endif + + if (ExtendedEnabled) +@@ -532,7 +533,22 @@ xf86EnableIO(void) + #endif + } + close(fd); +-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) ++#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__) + if (ioperm(0, 1024, 1) || iopl(3)) { + if (errno == ENODEV) + ErrorF("xf86EnableIOPorts: no I/O ports found\n"); |