Mesa (master): nvc0: ensure sufficient push space for indirect data

[GitLab Mirror]

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

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Sun Mar 21 04:05:06 2021 -0400

nvc0: ensure sufficient push space for indirect data

There may be up to 3 pushbuf data's submitted in this function, make
sure that we allocate enough room for these.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Karol Herbst <kherbst at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9740>

---

 src/gallium/drivers/nouveau/nvc0/nvc0_query_hw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw.c b/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw.c
index 389ccb7ddf0..9d01a5eb636 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw.c
@@ -435,7 +435,7 @@ nvc0_hw_get_query_result_resource(struct nvc0_context *nvc0,
    if (wait && hq->state != NVC0_HW_QUERY_STATE_READY)
       nvc0_hw_query_fifo_wait(nvc0, q);
 
-   nouveau_pushbuf_space(push, 32, 2, 0);
+   nouveau_pushbuf_space(push, 32, 2, 3);
    PUSH_REFN (push, hq->bo, NOUVEAU_BO_GART | NOUVEAU_BO_RD);
    PUSH_REFN (push, buf->bo, buf->domain | NOUVEAU_BO_WR);
    BEGIN_1IC0(push, NVC0_3D(MACRO_QUERY_BUFFER_WRITE), 9);