Module: Mesa Branch: main Commit: 65cd94c8f03a3c56c0c41bc296c7c9513f50675c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=65cd94c8f03a3c56c0c41bc296c7c9513f50675c
Author: Yogesh Mohan Marimuthu <[email protected]> Date: Sat Dec 9 18:17:57 2023 +0530 winsys/amdgpu: rename ptr_ib_size_inside_ib to is_chained_ib Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26612> --- src/gallium/winsys/amdgpu/drm/amdgpu_cs.c | 6 +++--- src/gallium/winsys/amdgpu/drm/amdgpu_cs.h | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c index 15cad62e144..0eaa1566eba 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c @@ -952,7 +952,7 @@ static bool amdgpu_get_new_ib(struct amdgpu_winsys *ws, /* ib_bytes is in dwords and the conversion to bytes will be done before * the CS ioctl. */ main_ib->ptr_ib_size = &chunk_ib->ib_bytes; - main_ib->ptr_ib_size_inside_ib = false; + main_ib->is_chained_ib = false; amdgpu_cs_add_buffer(rcs, main_ib->big_ib_buffer, RADEON_USAGE_READ | RADEON_PRIO_IB, 0); @@ -969,7 +969,7 @@ static bool amdgpu_get_new_ib(struct amdgpu_winsys *ws, static void amdgpu_set_ib_size(struct radeon_cmdbuf *rcs, struct amdgpu_ib *ib) { - if (ib->ptr_ib_size_inside_ib) { + if (ib->is_chained_ib) { *ib->ptr_ib_size = rcs->current.cdw | S_3F2_CHAIN(1) | S_3F2_VALID(1) | S_3F2_PRE_ENA(((struct amdgpu_cs*)ib)->preamble_ib_bo != NULL); @@ -1283,7 +1283,7 @@ static bool amdgpu_cs_check_space(struct radeon_cmdbuf *rcs, unsigned dw) amdgpu_set_ib_size(rcs, main_ib); main_ib->ptr_ib_size = new_ptr_ib_size; - main_ib->ptr_ib_size_inside_ib = true; + main_ib->is_chained_ib = true; /* Hook up the new chunk */ rcs->prev[rcs->num_prev].buf = rcs->current.buf; diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.h b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.h index b84edac937a..e9939711290 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.h +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.h @@ -59,8 +59,12 @@ struct amdgpu_ib { unsigned max_check_space_size; unsigned max_ib_size_dw; + /* ptr_ib_size initially points to cs->csc->chunk_ib->ib_bytes. + * If in amdgpu_cs_check_space() ib chaining is required, then ptr_ib_size will point + * to indirect buffer packet size field. + */ uint32_t *ptr_ib_size; - bool ptr_ib_size_inside_ib; + bool is_chained_ib; }; struct amdgpu_fence_list {
