summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2013-05-31 10:07:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-04 11:43:36 +0100
commitc252ed989dea10c558b7f1c8e995700a0ea8d257 (patch)
tree5c23f82a91de0c43c2d9e9ca2ddb3deb90810430
parent59bb8e17c7361f54c6c0857a1fd7570142ed0721 (diff)
downloadpoky-c252ed989dea10c558b7f1c8e995700a0ea8d257.tar.gz
xf86-video-modesetting: backport fix for graphics corruption
This fixes graphics corruption that can occur when using 32 bpp pixmaps with 24 bpp framebuffer. (From OE-Core rev: dc8ad21502549b33b4c59c31df66d15d2f656df7) Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-modesetting/support-32-bpp-pixmaps-when-24-bpp-fb-is-used.patch31
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.7.0.bb2
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-modesetting/support-32-bpp-pixmaps-when-24-bpp-fb-is-used.patch b/meta/recipes-graphics/xorg-driver/xf86-video-modesetting/support-32-bpp-pixmaps-when-24-bpp-fb-is-used.patch
new file mode 100644
index 0000000000..c3517572e5
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-modesetting/support-32-bpp-pixmaps-when-24-bpp-fb-is-used.patch
@@ -0,0 +1,31 @@
1Upstream-Status: Backport
2Signed-off-by: Jonathan Liu <net147@gmail.com>
3
4From cba29fd8c2f605ed66718aa3a6b5833deb5d4cf9 Mon Sep 17 00:00:00 2001
5From: Maarten Lankhorst <maarten.lankhorst@canonical.com>
6Date: Wed, 3 Apr 2013 12:08:44 +0200
7Subject: [PATCH] support 32 bpp pixmaps when 24 bpp fb is used.
8
9Fixes background corruption in ubuntu.
10
11Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
12---
13 src/driver.c | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/src/driver.c b/src/driver.c
17index 06d6d53..742aadd 100644
18--- a/src/driver.c
19+++ b/src/driver.c
20@@ -650,7 +650,7 @@ PreInit(ScrnInfoPtr pScrn, int flags)
21 #endif
22 drmmode_get_default_bpp(pScrn, &ms->drmmode, &defaultdepth, &defaultbpp);
23 if (defaultdepth == 24 && defaultbpp == 24)
24- bppflags = Support24bppFb;
25+ bppflags = SupportConvert32to24 | Support24bppFb;
26 else
27 bppflags = PreferConvert24to32 | SupportConvert24to32 | Support32bppFb;
28
29--
301.8.3
31
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.7.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.7.0.bb
index e45703fcf1..9f434025b0 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.7.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.7.0.bb
@@ -3,5 +3,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5e53d3fcadb1c23d122ad63cb099a918"
3 3
4DESCRIPTION = "X.Org X server -- modesetting display driver" 4DESCRIPTION = "X.Org X server -- modesetting display driver"
5 5
6SRC_URI += "file://support-32-bpp-pixmaps-when-24-bpp-fb-is-used.patch"
7
6SRC_URI[md5sum] = "38e64eb09cef9bdf1de400bbe9818321" 8SRC_URI[md5sum] = "38e64eb09cef9bdf1de400bbe9818321"
7SRC_URI[sha256sum] = "2bc55f776eaee7b4e13df13238d36c4facf1cdca095a11519baf2376f5c996ac" 9SRC_URI[sha256sum] = "2bc55f776eaee7b4e13df13238d36c4facf1cdca095a11519baf2376f5c996ac"