diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2013-01-07 13:44:01 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-07 13:39:15 +0000 |
| commit | aa2d9049a9a0f73123bf3d7e9221552ff49dab8a (patch) | |
| tree | a9cc2b631410eb6560dd42f63ed6d08c796b6f78 /meta/recipes-graphics/xorg-xserver | |
| parent | f67c0af055b7817f1bb931c98f22f1e3b540b10f (diff) | |
| download | openembedded-core-aa2d9049a9a0f73123bf3d7e9221552ff49dab8a.tar.gz openembedded-core-aa2d9049a9a0f73123bf3d7e9221552ff49dab8a.tar.bz2 openembedded-core-aa2d9049a9a0f73123bf3d7e9221552ff49dab8a.zip | |
xserver-xorg: add AArch64 support
Launchpad bug: https://bugs.launchpad.net/linaro-aarch64/+bug/1092128
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver')
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/aarch64.patch | 64 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bb | 1 |
2 files changed, 65 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/aarch64.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/aarch64.patch new file mode 100644 index 0000000000..8a4f3e33fe --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/aarch64.patch @@ -0,0 +1,64 @@ +Subject: Add AArch64 support to xserver-xorg +Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> + +lnx_video.c parts are not existing in 1.14 branch. + +Xserver was checked in AArch64 fastmodel (commercial one with graphics support). + +http://patchwork.freedesktop.org/patch/12785/ + +Upstream-status: Pending + +--- + hw/xfree86/os-support/linux/lnx_video.c | 4 ++-- + include/servermd.h | 7 +++++++ + 2 files changed, 9 insertions(+), 2 deletions(-) + +--- xorg-server-1.13.1.orig/hw/xfree86/os-support/linux/lnx_video.c ++++ xorg-server-1.13.1/hw/xfree86/os-support/linux/lnx_video.c +@@ -509,11 +509,11 @@ xf86EnableIO(void) + return FALSE; + } + #endif + } + close(fd); +-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__) ++#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__) && !defined(__aarch64__) + if (ioperm(0, 1024, 1) || iopl(3)) { + if (errno == ENODEV) + ErrorF("xf86EnableIOPorts: no I/O ports found\n"); + else + FatalError("xf86EnableIOPorts: failed to set IOPL" +@@ -538,11 +538,11 @@ xf86DisableIO(void) + if (!ExtendedEnabled) + return; + #if defined(__powerpc__) + munmap(ioBase, 0x20000); + ioBase = NULL; +-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__) ++#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__) && !defined(__aarch64__) + iopl(0); + ioperm(0, 1024, 0); + #endif + ExtendedEnabled = FALSE; + +--- xorg-server-1.13.1.orig/include/servermd.h ++++ xorg-server-1.13.1/include/servermd.h +@@ -243,10 +243,17 @@ SOFTWARE. + #define BITMAP_BIT_ORDER LSBFirst + #define GLYPHPADBYTES 4 + /* ???? */ + #endif /* AMD64 */ + ++#if defined(__aarch64__) || defined(aarch64) || defined(__aarch64) ++#define IMAGE_BYTE_ORDER MSBFirst ++#define BITMAP_BIT_ORDER MSBFirst ++#define GLYPHPADBYTES 4 ++/* ???? */ ++#endif /* AArch64 */ ++ + #if defined(SVR4) && (defined(__i386__) || defined(__i386) ) || \ + defined(__alpha__) || defined(__alpha) || \ + defined(__i386__) || \ + defined(__s390x__) || defined(__s390__) + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bb index d6c63b904e..50b3117da5 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bb @@ -4,6 +4,7 @@ require xserver-xorg.inc SRC_URI += "file://crosscompile.patch \ file://fix_open_max_preprocessor_error.patch \ file://mips64-compiler.patch \ + file://aarch64.patch \ " SRC_URI[md5sum] = "a13d8876e3e804189392119638a07a1f" |