summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-10-04 10:17:27 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-05 10:10:11 +0100
commitf63e8d2dcb2eed6592d6f90d154afd319335c5c8 (patch)
tree1390ec58964c2def8a0231d93492e7283dff41c5 /meta
parent28ffbd4e560fccb6e8eb24dc735c0838e9bc7d39 (diff)
downloadpoky-f63e8d2dcb2eed6592d6f90d154afd319335c5c8.tar.gz
xf86-video-intel: Upgrade to recent git
Upgrade from the latest snapshot to a recent git revision. Without this xvideo does not work on skylake: Backporting the specific fixes turned out to be too complex. Remove patches that are in upstream already, rebase disable-x11-dri3.patch. Fixes [YOCTO #10041] (From OE-Core rev: 1e295903c89630d5813a0d924a3da47b52f377ac) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@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-gen8-Fix-the-YUV-RGB-shader.patch65
-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/disable-x11-dri3.patch6
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel/sna-Protect-against-ABI-breakage-in-recent-versions-.patch70
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel/udev-fstat.patch59
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb (renamed from meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb)13
6 files changed, 10 insertions, 233 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-gen8-Fix-the-YUV-RGB-shader.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-gen8-Fix-the-YUV-RGB-shader.patch
deleted file mode 100644
index 35762192fd..0000000000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-gen8-Fix-the-YUV-RGB-shader.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1From c43617b739e358064396912c7a7a8028ca91d201 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
3Date: Thu, 16 Apr 2015 20:40:39 +0300
4Subject: [PATCH] gen8: Fix the YUV->RGB shader
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Use the correct register (Yn_01) with first half of the
10Y samples instead of using the register (Yn_23) with the
11second half twice when computing the green channel.
12
13Also use the Yn_01 register name instead of Yn for the red
14channel as well, just for a bit of extra consistency.
15
16Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89807
17Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
18Tested-by: Chris Wilson <chris@chris-wilson.co.uk>
19
20Upstream-Status: Backport
21Signed-off-by: Saul Wold <sgw@linux.intel.com>
22
23---
24 src/render_program/exa_wm_yuv_rgb.g8a | 4 ++--
25 src/render_program/exa_wm_yuv_rgb.g8b | 2 +-
26 2 files changed, 3 insertions(+), 3 deletions(-)
27
28diff --git a/src/render_program/exa_wm_yuv_rgb.g8a b/src/render_program/exa_wm_yuv_rgb.g8a
29index 7def093..34973ba 100644
30--- a/src/render_program/exa_wm_yuv_rgb.g8a
31+++ b/src/render_program/exa_wm_yuv_rgb.g8a
32@@ -76,7 +76,7 @@ add (16) Cbn<1>F Cb<8,8,1>F -0.501961F { compr align1 };
33 /*
34 * R = Y + Cr * 1.596
35 */
36-mov (8) acc0<1>F Yn<8,8,1>F { compr align1 };
37+mov (8) acc0<1>F Yn_01<8,8,1>F { compr align1 };
38 mac.sat(8) src_sample_r_01<1>F Crn_01<8,8,1>F 1.596F { compr align1 };
39
40 mov (8) acc0<1>F Yn_23<8,8,1>F { compr align1 };
41@@ -84,7 +84,7 @@ mac.sat(8) src_sample_r_23<1>F Crn_23<8,8,1>F 1.596F { compr align1 };
42 /*
43 * G = Crn * -0.813 + Cbn * -0.392 + Y
44 */
45-mov (8) acc0<1>F Yn_23<8,8,1>F { compr align1 };
46+mov (8) acc0<1>F Yn_01<8,8,1>F { compr align1 };
47 mac (8) acc0<1>F Crn_01<8,8,1>F -0.813F { compr align1 };
48 mac.sat(8) src_sample_g_01<1>F Cbn_01<8,8,1>F -0.392F { compr align1 };
49
50diff --git a/src/render_program/exa_wm_yuv_rgb.g8b b/src/render_program/exa_wm_yuv_rgb.g8b
51index 4494953..2cd6fc4 100644
52--- a/src/render_program/exa_wm_yuv_rgb.g8b
53+++ b/src/render_program/exa_wm_yuv_rgb.g8b
54@@ -6,7 +6,7 @@
55 { 0x80600048, 0x21c03ae8, 0x3e8d02c0, 0x3fcc49ba },
56 { 0x00600001, 0x24003ae0, 0x008d0320, 0x00000000 },
57 { 0x80600048, 0x21e03ae8, 0x3e8d02e0, 0x3fcc49ba },
58- { 0x00600001, 0x24003ae0, 0x008d0320, 0x00000000 },
59+ { 0x00600001, 0x24003ae0, 0x008d0300, 0x00000000 },
60 { 0x00600048, 0x24003ae0, 0x3e8d02c0, 0xbf5020c5 },
61 { 0x80600048, 0x22003ae8, 0x3e8d0340, 0xbec8b439 },
62 { 0x00600001, 0x24003ae0, 0x008d0320, 0x00000000 },
63--
642.5.0
65
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
deleted file mode 100644
index 29924bb90c..0000000000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
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/disable-x11-dri3.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch
index dda508dcfd..3dddd334bf 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch
@@ -12,6 +12,6 @@ diff --git a/configure.ac b/configure.ac
12index bd654f3..78a0e0d 100644 12index bd654f3..78a0e0d 100644
13--- a/configure.ac 13--- a/configure.ac
14+++ b/configure.ac 14+++ b/configure.ac
15@@ -251 +251 @@ fi 15@@ -279 +279 @@ fi
16-PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-present x11-xcb xshmfence x11 xrender xext libdrm], [x11_dri3="yes"], [x11_dri3="no"]) 16-PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-xfixes xcb-present x11-xcb xshmfence x11 xcomposite xdamage xrender xrandr xxf86vm xext libdrm], [x11_dri3="yes"], [x11_dri3="no"])
17+#PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-present x11-xcb xshmfence x11 xrender xext libdrm], [x11_dri3="yes"], [x11_dri3="no"]) 17+#PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-xfixes xcb-present x11-xcb xshmfence x11 xcomposite xdamage xrender xrandr xxf86vm xext libdrm], [x11_dri3="yes"], [x11_dri3="no"])
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/sna-Protect-against-ABI-breakage-in-recent-versions-.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/sna-Protect-against-ABI-breakage-in-recent-versions-.patch
deleted file mode 100644
index 589d52e0f0..0000000000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/sna-Protect-against-ABI-breakage-in-recent-versions-.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1From 7fe2b2948652443ff43d907855bd7a051d54d309 Mon Sep 17 00:00:00 2001
2From: Chris Wilson <chris@chris-wilson.co.uk>
3Date: Thu, 19 Mar 2015 23:14:17 +0000
4Subject: [PATCH] sna: Protect against ABI breakage in recent versions of
5 libdrm
6
7commit 7fe2b2948652443ff43d907855bd7a051d54d309 upstream.
8
9Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
10Upstream-Status: Backport
11Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
12
13diff --git a/src/sna/kgem.c b/src/sna/kgem.c
14index 11f0828f2bbc..6f16cbac87f2 100644
15--- a/src/sna/kgem.c
16+++ b/src/sna/kgem.c
17@@ -182,6 +182,15 @@ struct local_i915_gem_caching {
18 #define LOCAL_IOCTL_I915_GEM_SET_CACHING DRM_IOW(DRM_COMMAND_BASE + LOCAL_I915_GEM_SET_CACHING, struct local_i915_gem_caching)
19 #define LOCAL_IOCTL_I915_GEM_GET_CACHING DRM_IOW(DRM_COMMAND_BASE + LOCAL_I915_GEM_GET_CACHING, struct local_i915_gem_caching)
20
21+struct local_i915_gem_mmap {
22+ uint32_t handle;
23+ uint32_t pad;
24+ uint64_t offset;
25+ uint64_t size;
26+ uint64_t addr_ptr;
27+};
28+#define LOCAL_IOCTL_I915_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP, struct local_i915_gem_mmap)
29+
30 struct local_i915_gem_mmap2 {
31 uint32_t handle;
32 uint32_t pad;
33@@ -514,15 +523,15 @@ retry_wc:
34
35 static void *__kgem_bo_map__cpu(struct kgem *kgem, struct kgem_bo *bo)
36 {
37- struct drm_i915_gem_mmap mmap_arg;
38+ struct local_i915_gem_mmap arg;
39 int err;
40
41 retry:
42- VG_CLEAR(mmap_arg);
43- mmap_arg.handle = bo->handle;
44- mmap_arg.offset = 0;
45- mmap_arg.size = bytes(bo);
46- if ((err = do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_MMAP, &mmap_arg))) {
47+ VG_CLEAR(arg);
48+ arg.handle = bo->handle;
49+ arg.offset = 0;
50+ arg.size = bytes(bo);
51+ if ((err = do_ioctl(kgem->fd, LOCAL_IOCTL_I915_GEM_MMAP, &arg))) {
52 assert(err != EINVAL);
53
54 if (__kgem_throttle_retire(kgem, 0))
55@@ -536,10 +545,10 @@ retry:
56 return NULL;
57 }
58
59- VG(VALGRIND_MAKE_MEM_DEFINED(mmap_arg.addr_ptr, bytes(bo)));
60+ VG(VALGRIND_MAKE_MEM_DEFINED(arg.addr_ptr, bytes(bo)));
61
62 DBG(("%s: caching CPU vma for %d\n", __FUNCTION__, bo->handle));
63- return bo->map__cpu = (void *)(uintptr_t)mmap_arg.addr_ptr;
64+ return bo->map__cpu = (void *)(uintptr_t)arg.addr_ptr;
65 }
66
67 static int gem_write(int fd, uint32_t handle,
68--
692.4.4
70
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/udev-fstat.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/udev-fstat.patch
deleted file mode 100644
index 0e675ee9f2..0000000000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/udev-fstat.patch
+++ /dev/null
@@ -1,59 +0,0 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 12af8a575d1518d40416f83195049157c3a062a5 Mon Sep 17 00:00:00 2001
5From: Chris Wilson <chris@chris-wilson.co.uk>
6Date: Tue, 24 Feb 2015 15:25:40 +0000
7Subject: sna: udev integration depends on fstat and sys/stat.h
8
9src/sna/sna_driver.c: In function 'sna_handle_uevents':
10src/sna/sna_driver.c:759:2: error: implicit declaration of function 'fstat' [-Werror=implicit-function-declaration]
11
12Also take the opportunity to include udev support in the configure
13summary.
14
15Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
16
17diff --git a/configure.ac b/configure.ac
18index 7476e2b..de3a4b3 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -197,11 +197,15 @@ AC_ARG_ENABLE(udev,
22
23 if test "x$UDEV" != "xno"; then
24 PKG_CHECK_MODULES(UDEV, [libudev], [udev="yes"], [udev="no"])
25+ AC_CHECK_HEADERS([sys/stat.h], [], [udev="no"])
26 if test "x$UDEV" = "xyes" -a "x$udev" != "xyes"; then
27 AC_MSG_ERROR([udev support requested but not found (libudev)])
28 fi
29 if test "x$udev" = "xyes"; then
30 AC_DEFINE(HAVE_UDEV,1,[Enable udev-based monitor hotplug detection])
31+ udev_msg=" yes"
32+ else
33+ udev_msg=" no"
34 fi
35 fi
36
37@@ -911,6 +915,7 @@ echo " Support for Kernel Mode Setting? $KMS"
38 echo " Support for legacy User Mode Setting (for i810)? $UMS"
39 echo " Support for Direct Rendering Infrastructure:$dri_msg"
40 echo " Support for Xv motion compensation (XvMC and libXvMC):$xvmc_msg"
41+echo " Support for display hotplug notifications (udev):$udev_msg"
42 echo " Build additional tools and utilities?$tools_msg"
43 if test -n "$xp_msg"; then
44 echo " Experimental support:$xp_msg"
45diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
46index 8c0d0b5..bc20ef0 100644
47--- a/src/sna/sna_driver.c
48+++ b/src/sna/sna_driver.c
49@@ -740,6 +740,8 @@ sna_wakeup_handler(WAKEUPHANDLER_ARGS_DECL)
50 }
51
52 #if HAVE_UDEV
53+#include <sys/stat.h>
54+
55 static void
56 sna_handle_uevents(int fd, void *closure)
57 {
58--
59cgit v0.10.2
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
index d75b44f17e..06cc730f4f 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
@@ -9,12 +9,13 @@ Infrastructure (DRI)."
9 9
10LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e" 10LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
11 11
12SRC_URI += "file://disable-x11-dri3.patch \ 12SRCREV = "8f33f80100096f7790c7b819ce37a3ed8ce8b5fa"
13 file://always_include_xorg_server.h.patch \ 13PV = "2.99.917+git${SRCPV}"
14 file://sna-Protect-against-ABI-breakage-in-recent-versions-.patch \ 14S = "${WORKDIR}/git"
15 file://udev-fstat.patch \ 15
16 file://0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch \ 16SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-intel \
17 file://0001-gen8-Fix-the-YUV-RGB-shader.patch \ 17 file://disable-x11-dri3.patch \
18 file://always_include_xorg_server.h.patch \
18 " 19 "
19 20
20SRC_URI[md5sum] = "fa196a66e52c0c624fe5d350af7a5e7b" 21SRC_URI[md5sum] = "fa196a66e52c0c624fe5d350af7a5e7b"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-13 06:34:43 +0000