summaryrefslogtreecommitdiff
path: root/recipes-graphics
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2016-12-22 07:18:38 -0800
committerStefan Agner <stefan.agner@toradex.com>2017-01-09 15:06:34 -0800
commite73c5ff46fae16488a58f1e6bd73c508284de32c (patch)
treecb33ea42ea6c4622bdccb76d44f4657ebc0ba3b8 /recipes-graphics
parent9520a54d2507ae378419733aacaeb3ab3b6715cc (diff)
xserver-xorg: Fix 16 bit depth in modesetting driver
Requesting a 16 bit default depth lead to a inconsistency between X-Server and DRM drivers bpp setting. This is the default configuration for Vybrid. Add a patch fixing the issue. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-graphics')
-rw-r--r--recipes-graphics/xorg-xserver/xserver-xorg/0001-modesetting-Fix-16-bit-depth-bpp-mode.patch42
-rw-r--r--recipes-graphics/xorg-xserver/xserver-xorg_1.18.4.bbappend3
2 files changed, 45 insertions, 0 deletions
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0001-modesetting-Fix-16-bit-depth-bpp-mode.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0001-modesetting-Fix-16-bit-depth-bpp-mode.patch
new file mode 100644
index 0000000..5f5f9df
--- /dev/null
+++ b/recipes-graphics/xorg-xserver/xserver-xorg/0001-modesetting-Fix-16-bit-depth-bpp-mode.patch
@@ -0,0 +1,42 @@
+From 1bd53e69fbe9eb2f717c5f952a17cd706377876a Mon Sep 17 00:00:00 2001
+From: Stefan Agner <stefan@agner.ch>
+Date: Thu, 22 Dec 2016 15:30:48 +0100
+Subject: [PATCH] modesetting: Fix 16 bit depth/bpp mode
+
+When setting DefaultDepth to 16 in the Screen section, the current
+code requests a 32 bpp framebuffer, however the X-Server seems to
+assumes 16 bpp.
+
+Fixes commit 21217d02168d ("modesetting: Implement 32->24 bpp
+conversion in shadow update")
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ hw/xfree86/drivers/modesetting/driver.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
+index 14f80b36c..45804df05 100644
+--- a/hw/xfree86/drivers/modesetting/driver.c
++++ b/hw/xfree86/drivers/modesetting/driver.c
+@@ -832,7 +832,7 @@ PreInit(ScrnInfoPtr pScrn, int flags)
+ "Using 24bpp hw front buffer with 32bpp shadow\n");
+ defaultbpp = 32;
+ } else {
+- ms->drmmode.kbpp = defaultbpp;
++ ms->drmmode.kbpp = 0;
+ }
+ bppflags = PreferConvert24to32 | SupportConvert24to32 | Support32bppFb;
+
+@@ -852,6 +852,8 @@ PreInit(ScrnInfoPtr pScrn, int flags)
+ return FALSE;
+ }
+ xf86PrintDepthBpp(pScrn);
++ if (!ms->drmmode.kbpp)
++ ms->drmmode.kbpp = pScrn->bitsPerPixel;
+
+ /* Process the options */
+ xf86CollectOptions(pScrn, NULL);
+--
+2.11.0
+
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.18.4.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_1.18.4.bbappend
new file mode 100644
index 0000000..6be5b55
--- /dev/null
+++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.18.4.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/xserver-xorg:"
+
+SRC_URI_append = " file://0001-modesetting-Fix-16-bit-depth-bpp-mode.patch"