From 694e320643f7fc6a4f1a9cf3e4ac274c37cccdfb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 14 Feb 2019 00:38:37 -0500 Subject: [PATCH] winsys/amdgpu: clean up and remove nonsensical assertion MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The assertion considers max_dw from the current IB in the chain, but big_ib_buffer is a buffer for the next IB, which can be smaller. Tested-by: Dieter Nützel Acked-by: Nicolai Hähnle --- src/gallium/winsys/amdgpu/drm/amdgpu_cs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c index 83b04ff53af..4a2377f7e09 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c @@ -1030,8 +1030,7 @@ static bool amdgpu_cs_check_space(struct radeon_cmdbuf *rcs, unsigned dw) va = amdgpu_winsys_bo(ib->big_ib_buffer)->va; /* This space was originally reserved. */ - rcs->current.max_dw += 4; - assert(ib->used_ib_space + 4 * rcs->current.max_dw <= ib->big_ib_buffer->size); + rcs->current.max_dw += cs_epilog_dw; /* Pad with NOPs and add INDIRECT_BUFFER packet */ while ((rcs->current.cdw & 7) != 4) -- 2.30.2