From: Ben Skeggs <bskeggs@redhat.com>
Date: Mon, 20 Dec 2010 20:33:17 +0000 (+1000)
Subject: nvc0: BEGIN_RING->BEGIN_RING_NI in a couple of places
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=317a1445c85a667d84b0b4615685e3da178bc031;p=mesa.git

nvc0: BEGIN_RING->BEGIN_RING_NI in a couple of places
---

diff --git a/src/gallium/drivers/nvc0/nvc0_tex.c b/src/gallium/drivers/nvc0/nvc0_tex.c
index bf6ffc7da94..c9f929b9423 100644
--- a/src/gallium/drivers/nvc0/nvc0_tex.c
+++ b/src/gallium/drivers/nvc0/nvc0_tex.c
@@ -188,7 +188,7 @@ nvc0_validate_tic(struct nvc0_context *nvc0, int s)
          OUT_RING  (chan, 1);
          BEGIN_RING(chan, RING_MF(EXEC), 1);
          OUT_RING  (chan, 0x100111);
-         BEGIN_RING(chan, RING_MF(DATA), 8);
+         BEGIN_RING_NI(chan, RING_MF(DATA), 8);
          OUT_RING  (chan, tic->tic[0]);
          OUT_RELOCl(chan, res->bo, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_RD);
          OUT_RELOC (chan, res->bo, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_RD |
diff --git a/src/gallium/drivers/nvc0/nvc0_transfer.c b/src/gallium/drivers/nvc0/nvc0_transfer.c
index f6c78f239e9..67f6321cac6 100644
--- a/src/gallium/drivers/nvc0/nvc0_transfer.c
+++ b/src/gallium/drivers/nvc0/nvc0_transfer.c
@@ -219,7 +219,7 @@ nvc0_m2mf_push_rect(struct pipe_screen *pscreen,
       OUT_RING  (chan, (1 << NVC0_M2MF_EXEC_INC__SHIFT) |
                  NVC0_M2MF_EXEC_PUSH | NVC0_M2MF_EXEC_LINEAR_IN);
 
-      BEGIN_RING(chan, RING_MF(DATA), words);
+      BEGIN_RING_NI(chan, RING_MF(DATA), words);
       OUT_RINGp (chan, src, words);
 
       dy += line_count;