From c092c46b27c6f6a6674e8d67fb3afdb684811819 Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Tue, 17 Jun 2014 22:32:03 -0400 Subject: [PATCH] nv30: avoid dangling references to deleted contexts Signed-off-by: Ilia Mirkin Cc: "10.2" --- src/gallium/drivers/nouveau/nv30/nv30_context.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gallium/drivers/nouveau/nv30/nv30_context.c b/src/gallium/drivers/nouveau/nv30/nv30_context.c index f325c5cfc68..617b0887810 100644 --- a/src/gallium/drivers/nouveau/nv30/nv30_context.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_context.c @@ -165,6 +165,9 @@ nv30_context_destroy(struct pipe_context *pipe) if (nv30->draw) draw_destroy(nv30->draw); + if (nv30->screen->base.pushbuf->user_priv == &nv30->bufctx) + nv30->screen->base.pushbuf->user_priv = NULL; + nouveau_bufctx_del(&nv30->bufctx); if (nv30->screen->cur_ctx == nv30) -- 2.30.2