summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2017-01-26 16:33:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-05 09:22:16 +0000
commit6254e28b31212a36cef26c9552e99c015082afc4 (patch)
treebd273da678c058d6a29d0a64cb51cd5645a98a37 /meta/recipes-graphics
parentb76161a9a890481e8418a34b3250fc2debcb566f (diff)
downloadpoky-6254e28b31212a36cef26c9552e99c015082afc4.tar.gz
xserver-xorg: fix 16bit modes
Discovered on beaglebone black (From OE-Core rev: 21fcb42d97e90eb76283b69ab876729f4cee7ad7) Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-modesetting-Fix-16-bit-depth-bpp-mode.patch46
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.1.bb1
2 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-modesetting-Fix-16-bit-depth-bpp-mode.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-modesetting-Fix-16-bit-depth-bpp-mode.patch
new file mode 100644
index 0000000000..5243761f1e
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-modesetting-Fix-16-bit-depth-bpp-mode.patch
@@ -0,0 +1,46 @@
1From 5028ef46ff4ab0930224b71024a7349b05610d42 Mon Sep 17 00:00:00 2001
2From: Stefan Agner <stefan@agner.ch>
3Date: Thu, 22 Dec 2016 15:41:06 +0100
4Subject: [PATCH] modesetting: Fix 16 bit depth/bpp mode
5
6When setting DefaultDepth to 16 in the Screen section, the current
7code requests a 32 bpp framebuffer, however the X-Server seems to
8assumes 16 bpp.
9
10Fixes commit 21217d02168d ("modesetting: Implement 32->24 bpp
11conversion in shadow update")
12
13Signed-off-by: Stefan Agner <stefan@agner.ch>
14
15Upstream-Status: Submitted [1]
16
17[1] https://lists.x.org/archives/xorg-devel/2016-December/052113.html
18---
19 hw/xfree86/drivers/modesetting/driver.c | 4 +++-
20 1 file changed, 3 insertions(+), 1 deletion(-)
21
22diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
23index d7030e5..647ad83 100644
24--- a/hw/xfree86/drivers/modesetting/driver.c
25+++ b/hw/xfree86/drivers/modesetting/driver.c
26@@ -930,7 +930,7 @@ PreInit(ScrnInfoPtr pScrn, int flags)
27 "Using 24bpp hw front buffer with 32bpp shadow\n");
28 defaultbpp = 32;
29 } else {
30- ms->drmmode.kbpp = defaultbpp;
31+ ms->drmmode.kbpp = 0;
32 }
33 bppflags = PreferConvert24to32 | SupportConvert24to32 | Support32bppFb;
34
35@@ -950,6 +950,8 @@ PreInit(ScrnInfoPtr pScrn, int flags)
36 return FALSE;
37 }
38 xf86PrintDepthBpp(pScrn);
39+ if (!ms->drmmode.kbpp)
40+ ms->drmmode.kbpp = pScrn->bitsPerPixel;
41
42 /* Process the options */
43 xf86CollectOptions(pScrn, NULL);
44--
452.7.4
46
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.1.bb
index 987a2beb78..98ffc8676b 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.1.bb
@@ -3,6 +3,7 @@ require xserver-xorg.inc
3SRC_URI += "file://musl-arm-inb-outb.patch \ 3SRC_URI += "file://musl-arm-inb-outb.patch \
4 file://0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch \ 4 file://0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch \
5 file://0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch \ 5 file://0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch \
6 file://0003-modesetting-Fix-16-bit-depth-bpp-mode.patch \
6 " 7 "
7SRC_URI[md5sum] = "caa8ee7b2950abbf734347d137529fb6" 8SRC_URI[md5sum] = "caa8ee7b2950abbf734347d137529fb6"
8SRC_URI[sha256sum] = "79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb" 9SRC_URI[sha256sum] = "79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb"