summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2016-03-31 16:27:30 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-05 14:33:58 +0100
commit0e6743b4fde60c8fe87058c102ab89295820beb5 (patch)
treea117239459d204ae6e8f879a5a2c8c9bee7f3f53 /meta
parent21e31c277175539a5062e4202a1d500c10e4a512 (diff)
downloadpoky-0e6743b4fde60c8fe87058c102ab89295820beb5.tar.gz
xf86-video-intel: Add patch to allow UXA to build
This patch is a backport to fixup an API change in xorg-server (From OE-Core rev: c8aecfb55961431a5fbce6f90e582418983f17bf) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch30
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb1
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch
new file mode 100644
index 0000000000..29924bb90c
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch
@@ -0,0 +1,30 @@
1From 2c5063938cc809f624e56efd4673041fa8141e81 Mon Sep 17 00:00:00 2001
2From: Martin Peres <martin.peres@linux.intel.com>
3Date: Thu, 9 Jul 2015 11:26:38 +0300
4Subject: [PATCH] uxa: fix the call to PixmapSyncDirtyHelper, broken by
5 xserver's 90db5ed
6
7[ickle: switch to HAS_DIRTYTRACKING_ROTATION as suggested by Dave Airlie]
8Signed-off-by: Martin Peres <martin.peres@linux.intel.com>
9
10Upstream-Status: Backport
11Signed-off-by: Saul Wold <sgw@linux.intel.com>
12---
13 src/compat-api.h | 4 ++++
14 1 file changed, 4 insertions(+)
15
16diff --git a/src/compat-api.h b/src/compat-api.h
17index aa93bee..293e9d7 100644
18--- a/src/compat-api.h
19+++ b/src/compat-api.h
20@@ -247,3 +247,7 @@ static inline void FreePixmap(PixmapPtr pixmap)
21 #endif
22
23 #endif
24+
25+#if HAS_DIRTYTRACKING_ROTATION
26+#define PixmapSyncDirtyHelper(d, dd) PixmapSyncDirtyHelper(d)
27+#endif
28--
292.5.0
30
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb
index a2f145659b..f4125565c7 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb
@@ -13,6 +13,7 @@ SRC_URI += "file://disable-x11-dri3.patch \
13 file://always_include_xorg_server.h.patch \ 13 file://always_include_xorg_server.h.patch \
14 file://sna-Protect-against-ABI-breakage-in-recent-versions-.patch \ 14 file://sna-Protect-against-ABI-breakage-in-recent-versions-.patch \
15 file://udev-fstat.patch \ 15 file://udev-fstat.patch \
16 file://0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch \
16 " 17 "
17 18
18SRC_URI[md5sum] = "fa196a66e52c0c624fe5d350af7a5e7b" 19SRC_URI[md5sum] = "fa196a66e52c0c624fe5d350af7a5e7b"