xf86-video-intel: src/sna/sna.h

[Chris Wilson]

 src/sna/sna.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6c1e70ca4234a5ab23fcdb3735fc55ac7939c52c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Mar 26 22:23:49 2018 +0100

    sna: Fixup early assert of xf86ScrnToScreen
    
    During early init, xf86ScrnToScreen() may return NULL, so handle that
    possibility inside the assert.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna.h b/src/sna/sna.h
index c9097d3d..3ccc74c8 100644
--- a/src/sna/sna.h
+++ b/src/sna/sna.h
@@ -509,7 +509,7 @@ to_sna_from_screen(ScreenPtr screen)
 pure static inline ScreenPtr to_screen_from_sna(struct sna *sna)
 {
 	ScreenPtr screen = xf86ScrnToScreen(sna->scrn);
-	assert(sna == to_sna_from_screen(screen));
+	assert(!screen || sna == to_sna_from_screen(screen));
 	return screen;
 }