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

[Chris Wilson]

 src/sna/sna_driver.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit d4164de5ccb82068e2858a90b2cd44eef82b6037
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Mar 1 12:13:47 2013 +0000

    sna: Assert that the ScrnInfo and ScreenPtr relationship is correct
    
    References: https://bugs.freedesktop.org/show_bug.cgi?id=56608
    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 1cee1fb..2250e92 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -230,6 +230,9 @@ static Bool sna_create_screen_resources(ScreenPtr screen)
 	DBG(("%s(%dx%d@%d)\n", __FUNCTION__,
 	     screen->width, screen->height, screen->rootDepth));
 
+	assert(sna->scrn == xf86ScreenToScrn(screen));
+	assert(sna->scrn->pScreen == screen);
+
 	free(screen->devPrivate);
 	screen->devPrivate = NULL;
 
@@ -916,6 +919,9 @@ sna_screen_init(SCREEN_INIT_ARGS_DECL)
 
 	DBG(("%s\n", __FUNCTION__));
 
+	assert(sna->scrn == scrn);
+	assert(scrn->pScreen == NULL); /* set afterwards */
+
 	if (!sna_register_all_privates())
 		return FALSE;
 
commit 8d97c192a33473df3c9036147a4716783a86d742
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Mar 1 11:59:49 2013 +0000

    sna: Move some conditional code out-of-line
    
    Just to reduce the number of ifdefs, one at a time.
    
    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 bc1daef..1cee1fb 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -783,6 +783,7 @@ sna_uevent_fini(ScrnInfoPtr scrn)
 	DBG(("%s: removed uvent handler\n", __FUNCTION__));
 }
 #else
+static void sna_uevent_init(ScrnInfoPtr scrn) { }
 static void sna_uevent_fini(ScrnInfoPtr scrn) { }
 #endif /* HAVE_UDEV */
 
@@ -1030,9 +1031,7 @@ sna_screen_init(SCREEN_INIT_ARGS_DECL)
 
 	sna->suspended = FALSE;
 
-#if HAVE_UDEV
 	sna_uevent_init(scrn);
-#endif
 
 	return TRUE;
 }