From 28eb7214db3387eb55109273317a308617341a3f Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Tue, 1 Mar 2011 17:08:03 +1000 Subject: [PATCH] nvc0: fix a crash on context destruction Signed-off-by: Ben Skeggs --- src/gallium/drivers/nvc0/nvc0_context.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/nvc0/nvc0_context.c b/src/gallium/drivers/nvc0/nvc0_context.c index d5dcf1fb028..d6de979b132 100644 --- a/src/gallium/drivers/nvc0/nvc0_context.c +++ b/src/gallium/drivers/nvc0/nvc0_context.c @@ -62,8 +62,10 @@ nvc0_destroy(struct pipe_context *pipe) draw_destroy(nvc0->draw); - if (nvc0->screen->cur_ctx == nvc0) + if (nvc0->screen->cur_ctx == nvc0) { + nvc0->screen->base.channel->user_private = NULL; nvc0->screen->cur_ctx = NULL; + } FREE(nvc0); } @@ -73,8 +75,10 @@ nvc0_default_flush_notify(struct nouveau_channel *chan) { struct nvc0_context *nvc0 = chan->user_private; - nouveau_fence_update(&nvc0->screen->base, TRUE); + if (!nvc0) + return; + nouveau_fence_update(&nvc0->screen->base, TRUE); nouveau_fence_next(&nvc0->screen->base); } -- 2.30.2