xf86-video-intel: src/sna/sna_driver.c

[Chris Wilson]

 src/sna/sna_driver.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b45dbdbd446108745b39b305303b457f5e876989
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Sep 19 09:34:32 2016 +0100

    sna: Update sanity check for next stage of Xorg ABI
    
    Now X will set the scrn->screen backpointer before Init, update our
    assertion to track.
    
    Reported-by: Nick Sarnie <commendsarnex at gmail.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97855
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index 841ccd1..57562b2 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -1105,7 +1105,8 @@ sna_screen_init(SCREEN_INIT_ARGS_DECL)
 	DBG(("%s\n", __FUNCTION__));
 
 	assert(sna->scrn == scrn);
-	assert(to_screen_from_sna(sna) == NULL); /* set afterwards */
+	assert(to_screen_from_sna(sna) == NULL || /* set afterwards */
+	       to_screen_from_sna(sna) == screen);
 
 	assert(sna->freed_pixmap == NULL);