From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 11 Nov 2013 11:44:17 +0000 (+0000)
Subject: sna: Assert that gc->funcs is never set to NULL
X-Git-Tag: 2.99.906~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=29fcc15efabb5b1f7e1e0211da9714cf9e3cbd1c;p=platform%2Fupstream%2Fxf86-video-intel.git

sna: Assert that gc->funcs is never set to NULL

References: https://bugs.freedesktop.org/show_bug.cgi?id=71415
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 9cff1de..983a5f3 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -3948,6 +3948,7 @@ static bool must_check sna_gc_move_to_cpu(GCPtr gc,
 	assert(gc->ops == (GCOps *)&sna_gc_ops);
 	gc->ops = (GCOps *)&sna_gc_ops__cpu;
 
+	assert(gc->funcs);
 	sgc->old_funcs = gc->funcs;
 	gc->funcs = (GCFuncs *)&sna_gc_funcs__cpu;
 
@@ -4010,6 +4011,7 @@ static void sna_gc_move_to_gpu(GCPtr gc)
 
 	gc->ops = (GCOps *)&sna_gc_ops;
 	gc->funcs = sna_gc(gc)->old_funcs;
+	assert(gc->funcs);
 	gc->pCompositeClip = sna_gc(gc)->priv;
 	assert(gc->pCompositeClip);
 }