From 79e800109957e0f71ea1304430b4a5ae4c4d3c9b Mon Sep 17 00:00:00 2001 From: Benjamin Slade Date: Sat, 14 Dec 2019 18:05:35 -0700 Subject: [PATCH] xf86-video-intel: update to commit f66d39544bb8339130c96d282a80f87ca1606caf --- ...ME-output-support-since-xserver-1.20.patch | 93 ------------------- srcpkgs/xf86-video-intel/template | 9 +- 2 files changed, 4 insertions(+), 98 deletions(-) delete mode 100644 srcpkgs/xf86-video-intel/patches/0001-SNA-fix-PRIME-output-support-since-xserver-1.20.patch diff --git a/srcpkgs/xf86-video-intel/patches/0001-SNA-fix-PRIME-output-support-since-xserver-1.20.patch b/srcpkgs/xf86-video-intel/patches/0001-SNA-fix-PRIME-output-support-since-xserver-1.20.patch deleted file mode 100644 index ab6cd527b9..0000000000 --- a/srcpkgs/xf86-video-intel/patches/0001-SNA-fix-PRIME-output-support-since-xserver-1.20.patch +++ /dev/null @@ -1,93 +0,0 @@ -From e85424325911626556fbe5a313c698a5da701163 Mon Sep 17 00:00:00 2001 -From: Peter Wu -Date: Mon, 13 Aug 2018 22:59:50 +0200 -Subject: [PATCH xf86-video-intel] SNA: fix PRIME output support since xserver - 1.20 - -Since xorg-server 1.20, an external monitor would remain blank when used -in a PRIME output slave setup. Only a cursor was visible. The cause is -"Make PixmapDirtyUpdateRec::src a DrawablePtr" in xserver, the "src" -pointer might point to the root window (created by the server) instead -of a pixmap (as created by xf86-video-intel). Use get_drawable_pixmap to -handle both cases. - -When built with -fsanitize=address, the following test will trigger a -heap-buffer-overflow error due to to_sna_from_pixmap receiving a window -instead of a pixmap. - -Test on a hybrid graphics laptop (Intel + modesetting/nouveau): - - xrandr --setprovideroutputsource modesetting Intel - xrandr --output DP-1-1 --mode 2560x1440 # should not crash - glxgears # should display gears on both screens - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100086 -Signed-off-by: Peter Wu ---- -Tested with xserver 1.20.1 with ASAN enabled. Survives multiple -resolution changes, works with a Plasma desktop session, it seems -stable. Something like this patch is required to make multi-monitor -setups usable in a hybrid graphics setting with Xorg 1.20. ---- - src/sna/sna_accel.c | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c -index 2f669bcf..80b116a3 100644 ---- src/sna/sna_accel.c -+++ src/sna/sna_accel.c -@@ -17510,7 +17510,11 @@ static bool has_offload_slaves(struct sna *sna) - PixmapDirtyUpdatePtr dirty; - - xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) { -+#ifdef HAS_DIRTYTRACKING_DRAWABLE_SRC -+ assert(dirty->src == &sna->front->drawable); -+#else - assert(dirty->src == sna->front); -+#endif - if (RegionNotEmpty(DamageRegion(dirty->damage))) - return true; - } -@@ -17671,7 +17675,11 @@ static void sna_accel_post_damage(struct sna *sna) - if (RegionNil(damage)) - continue; - -+#ifdef HAS_DIRTYTRACKING_DRAWABLE_SRC -+ src = get_drawable_pixmap(dirty->src); -+#else - src = dirty->src; -+#endif - dst = dirty->slave_dst->master_pixmap; - - region.extents.x1 = dirty->x; -@@ -17922,9 +17930,15 @@ migrate_dirty_tracking(PixmapPtr old_front, PixmapPtr new_front) - PixmapDirtyUpdatePtr dirty, safe; - - xorg_list_for_each_entry_safe(dirty, safe, &screen->pixmap_dirty_list, ent) { -+#ifdef HAS_DIRTYTRACKING_DRAWABLE_SRC -+ assert(dirty->src == &old_front->drawable); -+ if (dirty->src != &old_front->drawable) -+ continue; -+#else - assert(dirty->src == old_front); - if (dirty->src != old_front) - continue; -+#endif - - DamageUnregister(&dirty->src->drawable, dirty->damage); - DamageDestroy(dirty->damage); -@@ -17939,7 +17953,11 @@ migrate_dirty_tracking(PixmapPtr old_front, PixmapPtr new_front) - } - - DamageRegister(&new_front->drawable, dirty->damage); -+#ifdef HAS_DIRTYTRACKING_DRAWABLE_SRC -+ dirty->src = &new_front->drawable; -+#else - dirty->src = new_front; -+#endif - } - #endif - } --- -2.18.0 - diff --git a/srcpkgs/xf86-video-intel/template b/srcpkgs/xf86-video-intel/template index 301608b4eb..8f0b071b21 100644 --- a/srcpkgs/xf86-video-intel/template +++ b/srcpkgs/xf86-video-intel/template @@ -1,9 +1,8 @@ # Template file for 'xf86-video-intel' pkgname=xf86-video-intel -version=2.99.917.847 +version=2.99.917.899 revision=1 -_commit=25c9a2fcc83ae7252a178b42262da383e59df744 -lib32disabled=yes +_commit=f66d39544bb8339130c96d282a80f87ca1606caf archs="i686* x86_64*" build_style=gnu-configure configure_args="--with-default-dri=3" @@ -12,9 +11,9 @@ makedepends="libXScrnSaver-devel libXcursor-devel libXinerama-devel libXrandr-devel libXvMC-devel xorg-server-devel" depends="virtual?xserver-abi-video-24_1 mesa-intel-dri" short_desc="Xorg DDX Intel video driver" -maintainer="Orphaned " -homepage="https://cgit.freedesktop.org/xorg/driver/xf86-video-intel" +maintainer="Benjamin Slade " license="MIT" +homepage="https://cgit.freedesktop.org/xorg/driver/xf86-video-intel" lib32disabled=yes LDFLAGS="-Wl,-z,lazy"