[arch-commits] Commit in xorg-server/trunk (2 files)

[Laurent Carlier]

    Date: Saturday, March 19, 2016 @ 12:25:44
  Author: lcarlier
Revision: 262078

upgpkg: xorg-server 1.18.2-3

workaround FS#48549

Added:
  xorg-server/trunk/0003-Revert-present-Requeue-if-flip-driver-hook-fails-and.patch
Modified:
  xorg-server/trunk/PKGBUILD

-----------------------------------------------------------------+
 0003-Revert-present-Requeue-if-flip-driver-hook-fails-and.patch |   39 ++++++++++
 PKGBUILD                                                        |   12 ++-
 2 files changed, 48 insertions(+), 3 deletions(-)

Added: 0003-Revert-present-Requeue-if-flip-driver-hook-fails-and.patch
===================================================================
--- 0003-Revert-present-Requeue-if-flip-driver-hook-fails-and.patch	                        (rev 0)
+++ 0003-Revert-present-Requeue-if-flip-driver-hook-fails-and.patch	2016-03-19 11:25:44 UTC (rev 262078)
@@ -0,0 +1,39 @@
+From 155768e794e31892037e1a082d8457f7f122b9f0 Mon Sep 17 00:00:00 2001
+From: Laurent Carlier <lordheavym at gmail.com>
+Date: Fri, 18 Mar 2016 15:10:37 +0100
+Subject: [PATCH xserver] Revert "present: Requeue if flip driver hook fails
+ and target MSC not reached"
+
+This reverts commit eb5108b87017128f394ae31b5b7cd85dd8819bca.
+---
+ present/present.c | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/present/present.c b/present/present.c
+index 55f6aa7..d6df54f 100644
+--- a/present/present.c
++++ b/present/present.c
+@@ -724,20 +724,6 @@ present_execute(present_vblank_ptr vblank, uint64_t ust, uint64_t crtc_msc)
+             if (window == screen_priv->flip_window)
+                 present_unflip(screen);
+         }
+-
+-        /* If present_flip failed, we may have to requeue for the target MSC */
+-        if (msc_is_after(vblank->target_msc, crtc_msc) &&
+-            Success == present_queue_vblank(screen,
+-                                            vblank->crtc,
+-                                            vblank->event_id,
+-                                            vblank->target_msc)) {
+-            xorg_list_add(&vblank->event_queue, &present_exec_queue);
+-            xorg_list_append(&vblank->window_list,
+-                             &present_get_window_priv(window, TRUE)->vblank);
+-            vblank->queued = TRUE;
+-            return;
+-        }
+-
+         present_copy_region(&window->drawable, vblank->pixmap, vblank->update, vblank->x_off, vblank->y_off);
+ 
+         /* present_copy_region sticks the region into a scratch GC,
+-- 
+2.7.3
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-19 11:12:17 UTC (rev 262077)
+++ PKGBUILD	2016-03-19 11:25:44 UTC (rev 262078)
@@ -5,7 +5,7 @@
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-xwayland' 'xorg-server-common' 'xorg-server-devel')
 pkgver=1.18.2
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('custom')
 groups=('xorg')
@@ -21,7 +21,8 @@
         xvfb-run
         xvfb-run.1
         0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch
-        0002-Xext-vidmode-Reduce-verbosity-of-GetModeLine.patch)
+        0002-Xext-vidmode-Reduce-verbosity-of-GetModeLine.patch
+        0003-Revert-present-Requeue-if-flip-driver-hook-fails-and.patch)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
               'C383B778255613DFDB409D91DB221A6900000011'
               'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3')
@@ -30,7 +31,8 @@
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
             '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
             '10c66c10f4f71930e2ac3f6e07881e228ca88542af449d2c69c7744ec87335df'
-            '72755a652e72144e3f28c8fa959b4a6df5def838db3cde5077a626e97baab591')
+            '72755a652e72144e3f28c8fa959b4a6df5def838db3cde5077a626e97baab591'
+            '692cccb82ae20be237ac9fda9347c06952e9ca2971d63dc54cf63ad2223d41a0')
 
 prepare() {
   cd "${pkgbase}-${pkgver}"
@@ -39,6 +41,10 @@
   patch -Np1 -i ../0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch
   # Fix flooding of Xorg log file
   patch -Np1 -i ../0002-Xext-vidmode-Reduce-verbosity-of-GetModeLine.patch
+  # workaround FS#48549
+  # upstream https://bugs.freedesktop.org/show_bug.cgi?id=94515
+  # upstream https://bugs.freedesktop.org/show_bug.cgi?id=94596
+  patch -Np1 -i ../0003-Revert-present-Requeue-if-flip-driver-hook-fails-and.patch
 }
 
 build() {