diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-17 21:46:07 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-17 21:46:07 +0200 |
| commit | 5880798304726de24b4c520a62a15b3090950c08 (patch) | |
| tree | 86245635249eb08177b4022724f1ac340ceed99f | |
| parent | 3ea355738c5c54573b2546fe387391b9f4bb2c05 (diff) | |
Update the xorg-server Loongson patch.
| -rw-r--r-- | extra/xorg-server/PKGBUILD | 2 | ||||
| -rw-r--r-- | extra/xorg-server/loongson.patch | 36 |
2 files changed, 19 insertions, 19 deletions
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 55db80a1f..d0ad0e355 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -30,7 +30,7 @@ sha1sums=('922b963901f4711449b53fb32ce3e14f5b642766' 'c94f742d3f9cabf958ae58e4015d9dd185aabedc' '6838fc00ef4618c924a77e0fb03c05346080908a' '993798f3d22ad672d769dae5f48d1fa068d5578f' - '1c23eec101ba547ebf2923bd36f958cd21e7ed94') + 'ac016ff8e3adfbd584fe16a770f6891724e254f4') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/xorg-server/loongson.patch b/extra/xorg-server/loongson.patch index b6c9692fc..ba4811ccf 100644 --- a/extra/xorg-server/loongson.patch +++ b/extra/xorg-server/loongson.patch @@ -1,34 +1,34 @@ -diff -ru xorg-server-1.11.2.orig/hw/xfree86/dri/sarea.h xorg-server-1.11.2/hw/xfree86/dri/sarea.h ---- xorg-server-1.11.2.orig/hw/xfree86/dri/sarea.h 2011-12-07 16:47:06.971237310 +0100 -+++ xorg-server-1.11.2/hw/xfree86/dri/sarea.h 2011-12-07 16:48:40.132392770 +0100 -@@ -42,6 +42,8 @@ +diff -ru xorg-server-1.12.1.orig/hw/xfree86/dri/sarea.h xorg-server-1.12.1/hw/xfree86/dri/sarea.h +--- xorg-server-1.12.1.orig/hw/xfree86/dri/sarea.h 2012-05-17 20:42:38.676378113 +0200 ++++ xorg-server-1.12.1/hw/xfree86/dri/sarea.h 2012-05-17 20:45:49.936966941 +0200 +@@ -41,6 +41,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 */ + #define SAREA_MAX 0x10000 /* 64kB */ #else -diff -ru xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c ---- xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c 2011-12-07 16:47:06.967237429 +0100 -+++ xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c 2011-12-07 16:52:33.200881187 +0100 -@@ -493,9 +493,10 @@ +diff -ru xorg-server-1.12.1.orig/hw/xfree86/os-support/linux/lnx_video.c xorg-server-1.12.1/hw/xfree86/os-support/linux/lnx_video.c +--- xorg-server-1.12.1.orig/hw/xfree86/os-support/linux/lnx_video.c 2012-05-17 20:42:38.672349775 +0200 ++++ xorg-server-1.12.1/hw/xfree86/os-support/linux/lnx_video.c 2012-05-17 20:47:23.059649687 +0200 +@@ -484,9 +484,10 @@ Bool xf86EnableIO(void) { -#if defined(__powerpc__) +#if defined(__powerpc__) || defined(__mips__) - int fd; - unsigned int ioBase_phys; -+ extern unsigned int IOPortBase; + int fd; + unsigned int ioBase_phys; ++ extern unsigned int IOPortBase; #endif - if (ExtendedEnabled) -@@ -520,6 +521,21 @@ + if (ExtendedEnabled) +@@ -511,6 +512,21 @@ #endif - } - close(fd); + } + close(fd); +#elif defined(__mips__) + fd = open("/dev/mem", O_RDWR); + IOPortBase = (volatile unsigned char *)mmap(0, 0x20000, @@ -45,5 +45,5 @@ diff -ru xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c xorg-se + "xf86EnableIOPorts: map iobase (%x)\n", + IOPortBase); #elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__) - if (ioperm(0, 1024, 1) || iopl(3)) { - if (errno == ENODEV) + if (ioperm(0, 1024, 1) || iopl(3)) { + if (errno == ENODEV) |