r47226 - in /desktop/unstable/cogl/debian: changelog patches/ patches/0001-kms-winsys-don-t-wait-for-a-flip-when-page-flipping-.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat Jan  9 22:56:36 2016
New Revision: 47226

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47226
Log:
Fix black screen after logout. Patch cherry-picked from upstream Git.
(Closes: #805763)

Added:
    desktop/unstable/cogl/debian/patches/
    desktop/unstable/cogl/debian/patches/0001-kms-winsys-don-t-wait-for-a-flip-when-page-flipping-.patch
    desktop/unstable/cogl/debian/patches/series
Modified:
    desktop/unstable/cogl/debian/changelog

Modified: desktop/unstable/cogl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/changelog?rev=47226&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/changelog	[utf-8] (original)
+++ desktop/unstable/cogl/debian/changelog	[utf-8] Sat Jan  9 22:56:36 2016
@@ -1,3 +1,10 @@
+cogl (1.22.0-2) UNRELEASED; urgency=medium
+
+  * Fix black screen after logout. Patch cherry-picked from upstream Git.
+    (Closes: #805763)
+
+ -- Michael Biebl <biebl at debian.org>  Sat, 09 Jan 2016 23:52:22 +0100
+
 cogl (1.22.0-1) unstable; urgency=medium
 
   * New upstream release.

Added: desktop/unstable/cogl/debian/patches/0001-kms-winsys-don-t-wait-for-a-flip-when-page-flipping-.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/patches/0001-kms-winsys-don-t-wait-for-a-flip-when-page-flipping-.patch?rev=47226&op=file
==============================================================================
--- desktop/unstable/cogl/debian/patches/0001-kms-winsys-don-t-wait-for-a-flip-when-page-flipping-.patch	(added)
+++ desktop/unstable/cogl/debian/patches/0001-kms-winsys-don-t-wait-for-a-flip-when-page-flipping-.patch	[utf-8] Sat Jan  9 22:56:36 2016
@@ -0,0 +1,42 @@
+From a583492ea2aa3ea8e78c269bd5db3f52f82aa79c Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Wed, 21 Oct 2015 15:47:01 -0400
+Subject: [PATCH] kms-winsys: don't wait for a flip when page flipping fails
+
+If we get EACCES from drmPageFlip we're not going to get
+a flip event and shouldn't wait for one.
+
+This commit changes the EACCES path to silently ignore the
+failed flip request and just clean up the fb.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=756926
+---
+ cogl/winsys/cogl-winsys-egl-kms.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/winsys/cogl-winsys-egl-kms.c
+index 20c325c..b460907 100644
+--- a/cogl/winsys/cogl-winsys-egl-kms.c
++++ b/cogl/winsys/cogl-winsys-egl-kms.c
+@@ -590,7 +590,7 @@ flip_all_crtcs (CoglDisplay *display, CoglFlipKMS *flip, int fb_id)
+   for (l = kms_display->crtcs; l; l = l->next)
+     {
+       CoglKmsCrtc *crtc = l->data;
+-      int ret;
++      int ret = 0;
+ 
+       if (crtc->count == 0 || crtc->ignore)
+         continue;
+@@ -610,7 +610,8 @@ flip_all_crtcs (CoglDisplay *display, CoglFlipKMS *flip, int fb_id)
+             }
+         }
+ 
+-      flip->pending++;
++      if (ret == 0)
++        flip->pending++;
+     }
+ 
+   if (kms_renderer->page_flips_not_supported && needs_flip)
+-- 
+2.7.0.rc3
+

Added: desktop/unstable/cogl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/patches/series?rev=47226&op=file
==============================================================================
--- desktop/unstable/cogl/debian/patches/series	(added)
+++ desktop/unstable/cogl/debian/patches/series	[utf-8] Sat Jan  9 22:56:36 2016
@@ -0,0 +1 @@
+0001-kms-winsys-don-t-wait-for-a-flip-when-page-flipping-.patch