summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nouveau/nv50
diff options
context:
space:
mode:
authorChristoph Bumiller <christoph.bumiller@speed.at>2013-05-12 15:41:29 +0200
committerIlia Mirkin <imirkin@alum.mit.edu>2014-05-23 12:34:38 -0400
commit7d11b761f248ebf5cc2c6732e67656f828afb110 (patch)
tree1d2f469956357df756f123526d5c9dc37835622e /src/gallium/drivers/nouveau/nv50
parent8dc4a98c44a824630f3cc234136833dbac9a1f4c (diff)
nv50,nvc0: always pull out bufctx on context destruction
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu> Cc: "10.2" <mesa-stable@lists.freedesktop.org>
Diffstat (limited to 'src/gallium/drivers/nouveau/nv50')
-rw-r--r--src/gallium/drivers/nouveau/nv50/nv50_context.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_context.c b/src/gallium/drivers/nouveau/nv50/nv50_context.c
index 52e14bf9ce2..f84459224c2 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_context.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_context.c
@@ -122,12 +122,9 @@ nv50_destroy(struct pipe_context *pipe)
{
struct nv50_context *nv50 = nv50_context(pipe);
- if (nv50_context_screen(nv50)->cur_ctx == nv50) {
- nv50->base.pushbuf->kick_notify = NULL;
+ if (nv50_context_screen(nv50)->cur_ctx == nv50)
nv50_context_screen(nv50)->cur_ctx = NULL;
- nouveau_pushbuf_bufctx(nv50->base.pushbuf, NULL);
- }
- /* need to flush before destroying the bufctx */
+ nouveau_pushbuf_bufctx(nv50->base.pushbuf, NULL);
nouveau_pushbuf_kick(nv50->base.pushbuf, nv50->base.pushbuf->channel);
nv50_context_unreference_resources(nv50);