summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nouveau/nouveau_winsys.h
diff options
context:
space:
mode:
authorIlia Mirkin <[email protected]>2015-10-05 15:19:05 -0400
committerIlia Mirkin <[email protected]>2015-10-07 04:30:05 -0400
commit47d11990b2ca3eb666b8ac81fee7f7eb5019eba1 (patch)
treea18b23e986ce8ebce547f0c6bc1bef0184d30eae /src/gallium/drivers/nouveau/nouveau_winsys.h
parent64d9d4b73031d1bc23ae869e2afad86ed01edea5 (diff)
nouveau: make sure there's always room to emit a fence
I started seeing a lot of situations on nv30 where fence emission wouldn't fit into the previous buffer (causing assertions). This ensures that whenever checking for space, we always leave a bit of extra room for the fence emission commands. Adjusts the nv30 and nvc0 fence emission logic to bypass the space checking as well. Signed-off-by: Ilia Mirkin <[email protected]> Cc: [email protected] Reviewed-by: Samuel Pitoiset <[email protected]>
Diffstat (limited to 'src/gallium/drivers/nouveau/nouveau_winsys.h')
-rw-r--r--src/gallium/drivers/nouveau/nouveau_winsys.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h
index 389a229eb78..a44fd3efcf7 100644
--- a/src/gallium/drivers/nouveau/nouveau_winsys.h
+++ b/src/gallium/drivers/nouveau/nouveau_winsys.h
@@ -24,6 +24,8 @@ PUSH_AVAIL(struct nouveau_pushbuf *push)
static inline bool
PUSH_SPACE(struct nouveau_pushbuf *push, uint32_t size)
{
+ /* Provide a buffer so that fences always have room to be emitted */
+ size += 8;
if (PUSH_AVAIL(push) < size)
return nouveau_pushbuf_space(push, size, 0, 0) == 0;
return true;