xf86-video-intel: 2 commits - src/sna/sna_display.c src/sna/xassert.h

[Chris Wilson]

 src/sna/sna_display.c |    2 ++
 src/sna/xassert.h     |   10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit ddf5feba786cf0147c4db9720c96e9a5636573b0
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Dec 1 10:00:32 2014 +0000

    sna: Generate a backtrace on assertion failures
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/xassert.h b/src/sna/xassert.h
index 7252ae8..1bcfd08 100644
--- a/src/sna/xassert.h
+++ b/src/sna/xassert.h
@@ -33,9 +33,15 @@
 #ifndef NDEBUG
 #include <os.h>
 #include "compiler.h"
+
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,6,0,0,0)
+#define xorg_backtrace()
+#endif
+
 #undef assert
-#define assert(E) do { \
-	if (unlikely(!(E))) FatalError("%s:%d assertion '%s' failed\n", __func__, __LINE__, #E); \
+#define assert(E) do if (unlikely(!(E))) { \
+	xorg_backtrace(); \
+	FatalError("%s:%d assertion '%s' failed\n", __func__, __LINE__, #E); \
 } while (0)
 #endif
 
commit e12ec452a99396f76138a5961c8195e22ca12ac1
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Dec 1 09:46:20 2014 +0000

    sna: Cancel pending mode change notification
    
    Along a couple of paths, we either do not care about the notification
    (i.e. during suspend) or do it explicitly. There we should mark the work
    as done.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 3ab85b2..aa5bdc3 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -5992,6 +5992,7 @@ sna_mode_enable(struct sna *sna)
 
 	update_flush_interval(sna);
 	sna_show_cursors(sna->scrn);
+	sna->mode.dirty = false;
 }
 
 void
@@ -6009,6 +6010,7 @@ sna_mode_close(struct sna *sna)
 	sna_cursors_fini(sna);
 
 	sna_backlight_close(sna);
+	sna->mode.dirty = false;
 }
 
 void