Mesa (9.0): nvc0: set rsvd_kick correctly

[Maarten Lankhorst]

Module: Mesa
Branch: 9.0
Commit: 4d07d52e279668c5ab71147ccee02f332806e5b6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4d07d52e279668c5ab71147ccee02f332806e5b6

Author: Maarten Lankhorst <maarten.lankhorst at canonical.com>
Date:   Wed Jun 26 16:45:09 2013 +0200

nvc0: set rsvd_kick correctly

This prevents trampling beyond the end of the command stream during flushes.

NOTE: This is a candidate for the stable branches.

Reported-by: Christoph Bumiller <christoph.bumiller at speed.at>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com>
(cherry picked from commit e72cc26518d8a60093ac497bf680c1f4ba614fa9)

---

 src/gallium/drivers/nvc0/nvc0_screen.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/gallium/drivers/nvc0/nvc0_screen.c b/src/gallium/drivers/nvc0/nvc0_screen.c
index 3a78aad..bed0336 100644
--- a/src/gallium/drivers/nvc0/nvc0_screen.c
+++ b/src/gallium/drivers/nvc0/nvc0_screen.c
@@ -430,6 +430,7 @@ nvc0_screen_create(struct nouveau_device *dev)
    chan = screen->base.channel;
    push = screen->base.pushbuf;
    push->user_priv = screen;
+   push->rsvd_kick = 5;
 
    screen->base.vidmem_bindings |= PIPE_BIND_CONSTANT_BUFFER |
       PIPE_BIND_VERTEX_BUFFER | PIPE_BIND_INDEX_BUFFER;