From: Bryan Cain <bryancain3@gmail.com>
Date: Tue, 7 May 2013 21:57:17 +0000 (-0500)
Subject: nv50: initialize kick_notify callback in nv50_create
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=14a0bb81fef164949aeb2ec2bcfe14fee4627eeb;p=mesa.git

nv50: initialize kick_notify callback in nv50_create

Fixes infinite loop on startup in Portal and Left 4 Dead 2.

NOTE: This is a candidate for the 9.0 and 9.1 branches.
---

diff --git a/src/gallium/drivers/nv50/nv50_context.c b/src/gallium/drivers/nv50/nv50_context.c
index 16697a0c5d6..5781c4bb766 100644
--- a/src/gallium/drivers/nv50/nv50_context.c
+++ b/src/gallium/drivers/nv50/nv50_context.c
@@ -242,6 +242,7 @@ nv50_create(struct pipe_screen *pscreen, void *priv)
       screen->cur_ctx = nv50;
       nouveau_pushbuf_bufctx(screen->base.pushbuf, nv50->bufctx);
    }
+   nv50->base.pushbuf->kick_notify = nv50_default_kick_notify;
 
    nv50_init_query_functions(nv50);
    nv50_init_surface_functions(nv50);