From 9fcbf515b431a92e0289f234ab77a796cf2a5612 Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Sun, 21 Jun 2015 15:00:16 -0400 Subject: nvc0: always put all tfb bufs into bufctx Since we clear the TFB bufctx binding point above, we need to put all of the active tfb's back in, even if they haven't changed since last time. Otherwise the tfb may get moved into sysmem and the underlying mapping will generate write errors. Signed-off-by: Ilia Mirkin Cc: "10.5 10.6" --- src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/gallium/drivers') diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c b/src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c index c9b5a5cbfc1..e0842784a88 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c @@ -262,11 +262,13 @@ nvc0_tfb_validate(struct nvc0_context *nvc0) if (tfb) targ->stride = tfb->stride[b]; + buf = nv04_resource(targ->pipe.buffer); + + BCTX_REFN(nvc0->bufctx_3d, TFB, buf, WR); + if (!(nvc0->tfbbuf_dirty & (1 << b))) continue; - buf = nv04_resource(targ->pipe.buffer); - if (!targ->clean) nvc0_query_fifo_wait(push, targ->pq); BEGIN_NVC0(push, NVC0_3D(TFB_BUFFER_ENABLE(b)), 5); @@ -280,7 +282,6 @@ nvc0_tfb_validate(struct nvc0_context *nvc0) PUSH_DATA(push, 0); /* TFB_BUFFER_OFFSET */ targ->clean = FALSE; } - BCTX_REFN(nvc0->bufctx_3d, TFB, buf, WR); } for (; b < 4; ++b) IMMED_NVC0(push, NVC0_3D(TFB_BUFFER_ENABLE(b)), 0); -- cgit v1.2.3