mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-11 16:59:59 +00:00
Code Issues Projects Releases Wiki Activity

pixman: fix qemu workaround

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Andreas Müller
2012-08-23 18:22:52 +02:00
committed by Martin Jansa
parent cc5eda871f
commit 624dcdc1fd
2 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-graphics/xorg-lib/pixman-0.27.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch
+31 -32
View File
@@ -1,25 +1,27 @@
From d140e69c1d76ed61d1feb53b79820951707ee5a6 Mon Sep 17 00:00:00 2001 From a0f53e1dbb3851bb0f0efcfdbd565b05e4be9cac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 19 Aug 2012 15:15:45 +0200 Date: Thu, 23 Aug 2012 18:10:57 +0200
Subject: [PATCH 1/2] ARM: qemu related workarounds in cpu features detection Subject: [PATCH 1/2] ARM: qemu related workarounds in cpu features detection
code code
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
This was ported from meta-oe's patch [1] This was ported from meta-oe's patch [1]. The original pixman patch is found
at [2].
[1] http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch [1] http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch
[2] http://lists.freedesktop.org/archives/pixman/2011-January/000906.html
Upstream-Status: Inappropriate [other] qemu fix Upstream-Status: Inappropriate [other] qemu fix
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
--- ---
pixman/pixman-arm.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++--- pixman/pixman-arm.c | 82 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 69 insertions(+), 5 deletions(-) 1 files changed, 65 insertions(+), 17 deletions(-)
diff --git a/pixman/pixman-arm.c b/pixman/pixman-arm.c diff --git a/pixman/pixman-arm.c b/pixman/pixman-arm.c
index 23374e4..d0771fd 100644 index 23374e4..d98bda6 100644
--- a/pixman/pixman-arm.c --- a/pixman/pixman-arm.c
+++ b/pixman/pixman-arm.c +++ b/pixman/pixman-arm.c
@@ -129,16 +129,35 @@ detect_cpu_features (void) @@ -129,16 +129,35 @@ detect_cpu_features (void)
@@ -58,40 +60,34 @@ index 23374e4..d0771fd 100644
fd = open ("/proc/self/auxv", O_RDONLY); fd = open ("/proc/self/auxv", O_RDONLY);
if (fd >= 0) if (fd >= 0)
@@ -147,22 +166,23 @@ detect_cpu_features (void) @@ -147,32 +166,61 @@ detect_cpu_features (void)
{ {
if (aux.a_type == AT_HWCAP) if (aux.a_type == AT_HWCAP)
{ {
- uint32_t hwcap = aux.a_un.a_val; - uint32_t hwcap = aux.a_un.a_val;
+ hwcap = aux.a_un.a_val; -
- /* hardcode these values to avoid depending on specific
/* hardcode these values to avoid depending on specific - * versions of the hwcap header, e.g. HWCAP_NEON
* versions of the hwcap header, e.g. HWCAP_NEON - */
*/
- if ((hwcap & 64) != 0) - if ((hwcap & 64) != 0)
+ if ((hwcap & ARM_HWCAP_VFP) != 0) - features |= ARM_VFP;
features |= ARM_VFP;
- if ((hwcap & 512) != 0) - if ((hwcap & 512) != 0)
+ if ((hwcap & ARM_HWCAP_IWMMXT) != 0) - features |= ARM_IWMMXT;
features |= ARM_IWMMXT; - /* this flag is only present on kernel 2.6.29 */
/* this flag is only present on kernel 2.6.29 */
- if ((hwcap & 4096) != 0) - if ((hwcap & 4096) != 0)
+ if ((hwcap & ARM_HWCAP_NEON) != 0) - features |= ARM_NEON;
features |= ARM_NEON; + hwcap = aux.a_un.a_val;
} }
else if (aux.a_type == AT_PLATFORM) else if (aux.a_type == AT_PLATFORM)
{ {
- const char *plat = (const char*) aux.a_un.a_val; - const char *plat = (const char*) aux.a_un.a_val;
-
- if (strncmp (plat, "v7l", 3) == 0)
+ plat = (const char*) aux.a_un.a_val; + plat = (const char*) aux.a_un.a_val;
+ plat_cnt++; + plat_cnt++;
+ }
if (strncmp (plat, "v7l", 3) == 0) + }
features |= (ARM_V7 | ARM_V6); + close (fd);
@@ -171,8 +191,52 @@ detect_cpu_features (void)
}
}
close (fd);
+
+ if (plat == NULL || plat_cnt != 1 || *plat != 'v') + if (plat == NULL || plat_cnt != 1 || *plat != 'v')
+ { + {
+ /* + /*
@@ -106,17 +102,19 @@ index 23374e4..d0771fd 100644
+ { + {
+ if (strcmp (u.machine, "armv7l") == 0) + if (strcmp (u.machine, "armv7l") == 0)
+ { + {
+ features |= (ARM_V7 | ARM_V6); features |= (ARM_V7 | ARM_V6);
- else if (strncmp (plat, "v6l", 3) == 0)
+ hwcap |= ARM_HWCAP_VFP; /* qemu is supposed to emulate vfp */ + hwcap |= ARM_HWCAP_VFP; /* qemu is supposed to emulate vfp */
+ hwcap |= ARM_HWCAP_NEON; /* qemu is supposed to emulate neon */ + hwcap |= ARM_HWCAP_NEON; /* qemu is supposed to emulate neon */
+ } + }
+ else if (strcmp (u.machine, "armv6l") == 0) + else if (strcmp (u.machine, "armv6l") == 0)
+ { + {
+ features |= ARM_V6; features |= ARM_V6;
+ hwcap |= ARM_HWCAP_VFP; /* qemu is supposed to emulate vfp */ + hwcap |= ARM_HWCAP_VFP; /* qemu is supposed to emulate vfp */
+ } + }
+ } }
+ } }
- close (fd);
+ else if (strncmp (plat, "v7l", 3) == 0) + else if (strncmp (plat, "v7l", 3) == 0)
+ { + {
+ features |= (ARM_V7 | ARM_V6); + features |= (ARM_V7 | ARM_V6);
@@ -134,6 +132,7 @@ index 23374e4..d0771fd 100644
+ features |= ARM_VFP; + features |= ARM_VFP;
+ if ((hwcap & ARM_HWCAP_IWMMXT) != 0) + if ((hwcap & ARM_HWCAP_IWMMXT) != 0)
+ features |= ARM_IWMMXT; + features |= ARM_IWMMXT;
+ /* this flag is only present on kernel 2.6.29 */
+ if ((hwcap & ARM_HWCAP_NEON) != 0) + if ((hwcap & ARM_HWCAP_NEON) != 0)
+ features |= ARM_NEON; + features |= ARM_NEON;
+ +
@@ -141,5 +140,5 @@ index 23374e4..d0771fd 100644
} }
-- --
1.7.4.4 1.7.6.5
meta-oe/recipes-graphics/xorg-lib/pixman_0.27.2.bbappend
+2
View File
@@ -1,5 +1,7 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:" FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
PRINC := "${@int(PRINC) + 1}"
SRC_URI += " \ SRC_URI += " \
file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \
file://0002-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \ file://0002-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \