Mesa (master): radv/winsys: Fix radv_amdgpu_cs_grow min_size argument. (v2 )

[Dave Airlie]

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

Author: Gustaw Smolarczyk <wielkiegie at gmail.com>
Date:   Thu Oct  6 19:50:47 2016 +0200

radv/winsys: Fix radv_amdgpu_cs_grow min_size argument. (v2)

It's supposed to be how much at least we want to grow the cs, not the
minimum size of the cs after growth.

v2: Unbreak use_ib_bos.
    Don't mask the ib_size when !use_ib_bos, since it's not needed.

Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
index 330b59b..41dfcd3 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
@@ -180,10 +180,6 @@ radv_amdgpu_cs_create(struct radeon_winsys *ws,
 static void radv_amdgpu_cs_grow(struct radeon_winsys_cs *_cs, size_t min_size)
 {
 	struct radv_amdgpu_cs *cs = radv_amdgpu_cs(_cs);
-	uint64_t ib_size = MAX2(min_size * 4 + 16, cs->base.max_dw * 4 * 2);
-
-	/* max that fits in the chain size field. */
-	ib_size = MIN2(ib_size, 0xfffff);
 
 	if (cs->failed) {
 		cs->base.cdw = 0;
@@ -191,6 +187,8 @@ static void radv_amdgpu_cs_grow(struct radeon_winsys_cs *_cs, size_t min_size)
 	}
 
 	if (!cs->ws->use_ib_bos) {
+		uint64_t ib_size = MAX2((cs->base.cdw + min_size) * 4 + 16,
+					cs->base.max_dw * 4 * 2);
 		uint32_t *new_buf = realloc(cs->base.buf, ib_size);
 		if (new_buf) {
 			cs->base.buf = new_buf;
@@ -202,6 +200,11 @@ static void radv_amdgpu_cs_grow(struct radeon_winsys_cs *_cs, size_t min_size)
 		return;
 	}
 
+	uint64_t ib_size = MAX2(min_size * 4 + 16, cs->base.max_dw * 4 * 2);
+
+	/* max that fits in the chain size field. */
+	ib_size = MIN2(ib_size, 0xfffff);
+
 	while (!cs->base.cdw || (cs->base.cdw & 7) != 4)
 		cs->base.buf[cs->base.cdw++] = 0xffff1000;