diff options
5 files changed, 26 insertions, 14 deletions
diff --git a/package/xorg-server/files/xorg.conf.lemote-yeelong b/package/xorg-server/files/xorg.conf.lemote-yeelong index 6fe95b179..4c8c5d71b 100644 --- a/package/xorg-server/files/xorg.conf.lemote-yeelong +++ b/package/xorg-server/files/xorg.conf.lemote-yeelong @@ -31,7 +31,6 @@ Section "Device" Option "pci_burst" "true" Option "HWCursor" "false" Option "SWCursor" "true" - Option "UseBIOS" "false" Option "PanelSize" "1024x600" EndSection diff --git a/package/xorg-server/patches/patch-fb_fb_h b/package/xorg-server/patches/patch-fb_fb_h index 82a814c7d..39d271d5a 100644 --- a/package/xorg-server/patches/patch-fb_fb_h +++ b/package/xorg-server/patches/patch-fb_fb_h @@ -1,8 +1,8 @@ Fix for xf86-video-siliconmotion in 16bpp with XAA, see: http://groups.google.com/group/loongson-dev/browse_thread/thread/570549e3d7894fef/5f04b3d9370adfd2 ---- xorg-server-1.7.6.orig/fb/fb.h 2010-03-12 05:38:21.000000000 +0100 -+++ xorg-server-1.7.6/fb/fb.h 2010-06-03 15:34:35.903809488 +0200 -@@ -75,7 +75,7 @@ +--- xorg-server-1.9.3.orig/fb/fb.h 2010-12-13 20:42:27.000000000 +0100 ++++ xorg-server-1.9.3/fb/fb.h 2012-10-01 13:23:55.000000000 +0200 +@@ -71,7 +71,7 @@ #define FBPREFIX(x) fb##x #define WRITE(ptr, val) (*(ptr) = (val)) #define READ(ptr) (*(ptr)) diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h index 44b9b9b1a..ebf414b0d 100644 --- a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h +++ b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h @@ -1,8 +1,8 @@ Caller side code changes regarding memory mapped IO. This patch applies for mips architectures and is used by xf86-video-siliconmotion. ---- xorg-server-1.7.6.orig/hw/xfree86/common/compiler.h 2010-03-12 05:38:22.000000000 +0100 -+++ xorg-server-1.7.6/hw/xfree86/common/compiler.h 2010-06-05 09:43:12.531809482 +0200 -@@ -713,42 +713,43 @@ xf86WriteMmio32LeNB(__volatile__ void *b +--- xorg-server-1.9.3.orig/hw/xfree86/common/compiler.h 2010-09-30 09:27:11.000000000 +0200 ++++ xorg-server-1.9.3/hw/xfree86/common/compiler.h 2012-10-01 13:23:55.000000000 +0200 +@@ -714,42 +714,43 @@ xf86WriteMmio32LeNB(__volatile__ void *b # define PORT_SIZE short # endif diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c new file mode 100644 index 000000000..c75c99f14 --- /dev/null +++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c @@ -0,0 +1,13 @@ +--- xorg-server-1.9.3.orig/hw/xfree86/os-support/linux/lnx_init.c 2010-09-28 19:17:31.000000000 +0200 ++++ xorg-server-1.9.3/hw/xfree86/os-support/linux/lnx_init.c 2012-10-01 16:32:57.000000000 +0200 +@@ -95,8 +95,8 @@ xf86OpenConsole(void) + struct vt_mode VT; + struct vt_stat vts; + MessageType from = X_PROBED; +- char *tty0[] = { "/dev/tty0", "/dev/vc/0", NULL }; +- char *vcs[] = { "/dev/vc/%d", "/dev/tty%d", NULL }; ++ char *tty0[] = { "/dev/tty0", NULL }; ++ char *vcs[] = { "/dev/tty%d", NULL }; + + if (serverGeneration == 1) { + diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c index ccbe060a4..c6cd39636 100644 --- a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c +++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c @@ -1,8 +1,8 @@ Enable the ioBase mapping code for mips, too. This is needed by xf86-video-siliconmotion. ---- xorg-server-1.7.6.orig/hw/xfree86/os-support/linux/lnx_video.c 2010-03-12 05:38:22.000000000 +0100 -+++ xorg-server-1.7.6/hw/xfree86/os-support/linux/lnx_video.c 2010-06-05 21:46:29.659792653 +0200 -@@ -485,7 +485,7 @@ unmapVidMem(int ScreenNum, pointer Base, +--- xorg-server-1.9.3.orig/hw/xfree86/os-support/linux/lnx_video.c 2010-11-23 20:07:26.000000000 +0100 ++++ xorg-server-1.9.3/hw/xfree86/os-support/linux/lnx_video.c 2012-10-01 13:23:55.000000000 +0200 +@@ -480,7 +480,7 @@ unmapVidMem(int ScreenNum, pointer Base, /* I/O Permissions section */ /***************************************************************************/ @@ -11,7 +11,7 @@ volatile unsigned char *ioBase = NULL; #ifndef __NR_pciconfig_iobase -@@ -497,7 +497,7 @@ volatile unsigned char *ioBase = NULL; +@@ -492,7 +492,7 @@ volatile unsigned char *ioBase = NULL; Bool xf86EnableIO(void) { @@ -20,7 +20,7 @@ int fd; unsigned int ioBase_phys; #endif -@@ -505,8 +505,12 @@ xf86EnableIO(void) +@@ -500,8 +500,12 @@ xf86EnableIO(void) if (ExtendedEnabled) return TRUE; @@ -34,7 +34,7 @@ fd = open("/dev/mem", O_RDWR); if (ioBase == NULL) { -@@ -522,9 +526,10 @@ xf86EnableIO(void) +@@ -517,9 +521,10 @@ xf86EnableIO(void) return FALSE; } #endif @@ -46,7 +46,7 @@ if (ioperm(0, 1024, 1) || iopl(3)) { if (errno == ENODEV) ErrorF("xf86EnableIOPorts: no I/O ports found\n"); -@@ -548,10 +553,10 @@ xf86DisableIO(void) +@@ -545,10 +550,10 @@ xf86DisableIO(void) { if (!ExtendedEnabled) return; |