Mesa (master): nvc0: inform kernel about buffers that screen_create touches

[Ben Skeggs]

Module: Mesa
Branch: master
Commit: 085ad4821e450349ec1ba8c82d4bd0e7dcfef0af
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=085ad4821e450349ec1ba8c82d4bd0e7dcfef0af

Author: Ben Skeggs <bskeggs at redhat.com>
Date:   Fri Nov 22 11:34:13 2013 +1000

nvc0: inform kernel about buffers that screen_create touches

Prevents a GPU page fault if somehow the uniform bo gets evicted
before the screen_create pushbuf has been submitted.

Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

---

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

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
index 253ee79..b203089 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
@@ -743,6 +743,8 @@ nvc0_screen_create(struct nouveau_device *dev)
    if (ret)
       goto fail;
 
+   PUSH_REFN (push, screen->uniform_bo, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+
    for (i = 0; i < 5; ++i) {
       /* TIC and TSC entries for each unit (nve4+ only) */
       /* auxiliary constants (6 user clip planes, base instance id) */