Mesa (master): radv/winsys: fix padding command stream for SI

[Dave Airlie]

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

Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Jul 26 03:25:24 2017 +0100

radv/winsys: fix padding command stream for SI

We were adding pad to size after creating the object, so we could
submit a CS bigger than the bo created for it.

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 | 10 ++++++----
 1 file changed, 6 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 0d89b950d2..ad4b0b3f9d 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
@@ -841,7 +841,7 @@ static int radv_amdgpu_winsys_cs_submit_sysmem(struct radeon_winsys_ctx *_ctx,
 		uint32_t *ptr;
 		unsigned cnt = 0;
 		unsigned size = 0;
-
+		unsigned pad_words = 0;
 		if (preamble_cs)
 			size += preamble_cs->cdw;
 
@@ -850,6 +850,10 @@ static int radv_amdgpu_winsys_cs_submit_sysmem(struct radeon_winsys_ctx *_ctx,
 			++cnt;
 		}
 
+		while(!size || (size & 7)) {
+			size++;
+			pad_words++;
+		}
 		assert(cnt);
 
 		bo = ws->buffer_create(ws, 4 * size, 4096, RADEON_DOMAIN_GTT, RADEON_FLAG_CPU_ACCESS);
@@ -867,10 +871,8 @@ static int radv_amdgpu_winsys_cs_submit_sysmem(struct radeon_winsys_ctx *_ctx,
 
 		}
 
-		while(!size || (size & 7)) {
+		for (unsigned j = 0; j < pad_words; ++j)
 			*ptr++ = pad_word;
-			++size;
-		}
 
 		memset(&request, 0, sizeof(request));