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

[Chris Wilson]

 src/sna/sna_driver.c |   11 ++++++-----
 src/uxa/Makefile.am  |    2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 3cb75950a90c28690f78fd3bf93ff8e23e5d543a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jul 29 11:03:43 2013 +0100

    uxa: Fix incorrect include path
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/uxa/Makefile.am b/src/uxa/Makefile.am
index dfb556f..971ac21 100644
--- a/src/uxa/Makefile.am
+++ b/src/uxa/Makefile.am
@@ -20,7 +20,7 @@
 
 AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @PCIACCESS_CFLAGS@
 AM_CFLAGS += @UDEV_CFLAGS@ @DRM_CFLAGS@ @DRMINTEL_CFLAGS@
-AM_CFLAGS += -I$(top_srcdir)/uxa -I$(top_srcdir)/src -I$(top_srcdir)/src/render_program
+AM_CFLAGS += -I$(top_srcdir)/xvmc -I$(top_srcdir)/src -I$(top_srcdir)/src/render_program
 
 noinst_LTLIBRARIES = libuxa.la
 libuxa_la_LIBADD = @UDEV_LIBS@ @DRMINTEL_LIBS@ @DRM_LIBS@
commit 1dd79c225cedf5614a77e5db9f9d9700bf957bb8
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jul 24 14:06:05 2013 +0100

    sna: Restore driver info upon FreeScreen
    
    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 ec3ee13..9c338bb 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -968,12 +968,13 @@ static void sna_free_screen(FREE_SCREEN_ARGS_DECL)
 	struct sna *sna = to_sna(scrn);
 
 	DBG(("%s\n", __FUNCTION__));
+	if ((uintptr_t)sna & 1)
+		return;
 
-	if (sna && ((intptr_t)sna & 1) == 0) {
-		sna_mode_fini(sna);
-		free(sna);
-	}
-	scrn->driverPrivate = NULL;
+	scrn->driverPrivate = (void *)((uintptr_t)sna->info | 1);
+
+	sna_mode_fini(sna);
+	free(sna);
 
 	intel_put_device(scrn);
 }