Mesa (master): freedreno: honor FD_MESA_DEBUG=nogrow

[GitLab Mirror]

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

Author: Rob Clark <robdclark at chromium.org>
Date:   Fri Feb 21 13:10:09 2020 -0800

freedreno: honor FD_MESA_DEBUG=nogrow

Signed-off-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3989>

---

 src/gallium/drivers/freedreno/freedreno_batch.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/freedreno/freedreno_batch.c b/src/gallium/drivers/freedreno/freedreno_batch.c
index 8f3f7827ce3..0dc27adb156 100644
--- a/src/gallium/drivers/freedreno/freedreno_batch.c
+++ b/src/gallium/drivers/freedreno/freedreno_batch.c
@@ -39,6 +39,7 @@ static void
 batch_init(struct fd_batch *batch)
 {
 	struct fd_context *ctx = batch->ctx;
+	enum fd_ringbuffer_flags flags = 0;
 	unsigned size = 0;
 
 	/* if kernel is too old to support unlimited # of cmd buffers, we
@@ -51,21 +52,23 @@ batch_init(struct fd_batch *batch)
 	if ((fd_device_version(ctx->screen->dev) < FD_VERSION_UNLIMITED_CMDS) ||
 			(fd_mesa_debug & FD_DBG_NOGROW)){
 		size = 0x100000;
+	} else {
+		flags = FD_RINGBUFFER_GROWABLE;
 	}
 
 	batch->submit = fd_submit_new(ctx->pipe);
 	if (batch->nondraw) {
 		batch->draw = fd_submit_new_ringbuffer(batch->submit, size,
-				FD_RINGBUFFER_PRIMARY | FD_RINGBUFFER_GROWABLE);
+				FD_RINGBUFFER_PRIMARY | flags);
 	} else {
 		batch->gmem = fd_submit_new_ringbuffer(batch->submit, size,
-				FD_RINGBUFFER_PRIMARY | FD_RINGBUFFER_GROWABLE);
+				FD_RINGBUFFER_PRIMARY | flags);
 		batch->draw = fd_submit_new_ringbuffer(batch->submit, size,
-				FD_RINGBUFFER_GROWABLE);
+				flags);
 
 		if (ctx->screen->gpu_id < 600) {
 			batch->binning = fd_submit_new_ringbuffer(batch->submit,
-					size, FD_RINGBUFFER_GROWABLE);
+					size, flags);
 		}
 	}