diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-09-06 15:22:55 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-10 13:01:55 +0100 |
commit | 11432c69fa396eaad3eb5bd1644e9c86b80b5e55 (patch) | |
tree | 23ff736edd81ad50969cb9a68e6c95af8c182b17 /meta/recipes-devtools/qemu/qemu-1.2.0/arm-bgr.patch | |
parent | f6cc0772504f3af0869f31abb0da0e5686c61aa8 (diff) | |
download | poky-11432c69fa396eaad3eb5bd1644e9c86b80b5e55.tar.gz |
qemu: Update from 0.15 to 1.2
Forward port the patches which were not applied upstream
(From OE-Core rev: 0c1328a27881f1b3046ed527447608a9fa91b1ea)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu-1.2.0/arm-bgr.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu-1.2.0/arm-bgr.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-1.2.0/arm-bgr.patch b/meta/recipes-devtools/qemu/qemu-1.2.0/arm-bgr.patch new file mode 100644 index 0000000000..f3ebde6364 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu-1.2.0/arm-bgr.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | After kernel commit: | ||
2 | |||
3 | http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-3.0/commit/?h=meta&id=9728c1b6a724daefc413b44e10253cdbb5e06d08 | ||
4 | |||
5 | It appears that the emulated colours in qemu are incorrect and that | ||
6 | the red and blue channels are reversed. This patch reverses that logic | ||
7 | so the colours are correctly displayed on the versatile platform which | ||
8 | doesn't support the BGR bit. | ||
9 | |||
10 | RP 16/9/2011 | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | Index: qemu-1.2.0/hw/pl110.c | ||
15 | =================================================================== | ||
16 | --- qemu-1.2.0.orig/hw/pl110.c 2012-09-06 14:07:27.619821133 -0700 | ||
17 | +++ qemu-1.2.0/hw/pl110.c 2012-09-06 14:12:07.699829648 -0700 | ||
18 | @@ -168,7 +168,11 @@ | ||
19 | fprintf(stderr, "pl110: Bad color depth\n"); | ||
20 | exit(1); | ||
21 | } | ||
22 | - if (s->cr & PL110_CR_BGR) | ||
23 | + | ||
24 | + if (s->version && s->bpp == BPP_16) | ||
25 | + /* Code assumes BPP_16 == 565 and BGR is never set on the versatile in 565 mode */ | ||
26 | + bpp_offset = 0; | ||
27 | + else if (s->cr & PL110_CR_BGR) | ||
28 | bpp_offset = 0; | ||
29 | else | ||
30 | bpp_offset = 24; | ||