diff options
| author | Gustaw Smolarczyk <[email protected]> | 2016-10-06 19:50:47 +0200 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2016-10-12 09:06:30 +1000 |
| commit | c3f3c6b0e836e55289abaf1f3bcda58eef92764c (patch) | |
| tree | c1456cc586f8c7aafe2410bd5b2eed19d75def7a /src/amd | |
| parent | a22b5f28fbcc3cda9c756dec339c7e729d1d10f3 (diff) | |
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 <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/amd')
| -rw-r--r-- | src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c | 11 |
1 files 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 330b59b174a..41dfcd323e2 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; |