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

Chris Wilson ickle at kemper.freedesktop.org
Tue Oct 9 10:38:03 PDT 2012


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

New commits:
commit ae6ae91baa0574a7a23ab76afac5e2d827c49c20
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Oct 9 18:36:59 2012 +0100

    sna: Check the map exists before trying to release it
    
    Reported-by: Clemens Eisserer <linuxhippy at gmail.com>
    Bugzilla: ttps://bugs.freedesktop.org/show_bug.cgi?id=55812
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 6f33ed5..4b29dcb 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -4118,7 +4118,7 @@ retry:
 	}
 
 	VG(VALGRIND_MAKE_MEM_DEFINED(mmap_arg.addr_ptr, bytes(bo)));
-	if (bo->domain == DOMAIN_CPU) {
+	if (bo->map && bo->domain == DOMAIN_CPU) {
 		DBG(("%s: discarding GTT vma for %d\n", __FUNCTION__, bo->handle));
 		kgem_bo_release_map(kgem, bo);
 	}


More information about the xorg-commit mailing list