Module: Mesa Branch: main Commit: c7d004d0294a431284e1006ca6964a3dccbbf067 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c7d004d0294a431284e1006ca6964a3dccbbf067
Author: Yogesh Mohan Marimuthu <[email protected]> Date: Sat Dec 9 17:24:39 2023 +0530 winsys/amdgpu: remove rcs variable from struct amdgpu_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 | 5 ++--- src/gallium/winsys/amdgpu/drm/amdgpu_cs.h | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c index 78952c14dec..3f1274c1b7e 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c @@ -954,7 +954,7 @@ static bool amdgpu_get_new_ib(struct amdgpu_winsys *ws, main_ib->ptr_ib_size = &chunk_ib->ib_bytes; main_ib->ptr_ib_size_inside_ib = false; - amdgpu_cs_add_buffer(cs->main_ib.rcs, main_ib->big_ib_buffer, + amdgpu_cs_add_buffer(rcs, main_ib->big_ib_buffer, RADEON_USAGE_READ | RADEON_PRIO_IB, 0); rcs->current.buf = (uint32_t*)(main_ib->ib_mapped + main_ib->used_ib_space); @@ -1153,7 +1153,6 @@ amdgpu_cs_create(struct radeon_cmdbuf *rcs, cs->csc1.ws = ctx->ws; cs->csc2.ws = ctx->ws; - cs->main_ib.rcs = rcs; rcs->priv = cs; if (!amdgpu_get_new_ib(ctx->ws, rcs, &cs->main_ib, cs)) { @@ -1299,7 +1298,7 @@ static bool amdgpu_cs_check_space(struct radeon_cmdbuf *rcs, unsigned dw) rcs->current.max_dw = main_ib->big_ib_buffer->size / 4 - cs_epilog_dw; rcs->gpu_address = va; - amdgpu_cs_add_buffer(cs->main_ib.rcs, main_ib->big_ib_buffer, + amdgpu_cs_add_buffer(rcs, main_ib->big_ib_buffer, RADEON_USAGE_READ | RADEON_PRIO_IB, 0); return true; diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.h b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.h index 5187f5e1c14..b84edac937a 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.h +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.h @@ -47,8 +47,6 @@ enum ib_type { }; struct amdgpu_ib { - struct radeon_cmdbuf *rcs; /* pointer to the driver-owned data */ - /* A buffer out of which new IBs are allocated. */ struct pb_buffer *big_ib_buffer; uint8_t *ib_mapped;
