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

[Chris Wilson]

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

New commits:
commit 1b3cf1efe3c091f5c4c519c81381475fb2587383
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Aug 17 12:45:24 2015 +0100

    sna/dri2: Check that the copy succeeds before associating the request
    
    If the DRI2 copy ends up on the CPU, then we will not have a GPU
    request for the operation.
    
    Reported-by: Zdenek Kabelac <zkabelac at redhat.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
index 8e1a46d..4389816 100644
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -1327,7 +1327,7 @@ __sna_dri2_copy_region(struct sna *sna, DrawablePtr draw, RegionPtr region,
 
 	if (flags & (DRI2_SYNC | DRI2_BO)) { /* STAT! */
 		struct kgem_request *rq = RQ(dst_bo->rq);
-		if (rq != (void *)&sna->kgem) {
+		if (rq && rq != (void *)&sna->kgem) {
 			if (rq->bo == NULL)
 				kgem_submit(&sna->kgem);
 			if (rq->bo) { /* Becareful in case the gpu is wedged */