From c7e84861303e623e139a318b15d6695ca8125a67 Mon Sep 17 00:00:00 2001 From: Yogesh Mohan Marimuthu Date: Mon, 4 Mar 2024 10:47:34 +0530 Subject: [PATCH] winsys/amdgpu: rws instead of ws for radeon_winsys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/winsys/amdgpu/drm/amdgpu_bo.c | 12 ++++++------ src/gallium/winsys/amdgpu/drm/amdgpu_cs.cpp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c index 0cf981fa604..d6094e4e497 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c @@ -1465,13 +1465,13 @@ no_slab: } static struct pb_buffer_lean * -amdgpu_buffer_create(struct radeon_winsys *ws, +amdgpu_buffer_create(struct radeon_winsys *rws, uint64_t size, unsigned alignment, enum radeon_bo_domain domain, enum radeon_bo_flag flags) { - struct pb_buffer_lean * res = amdgpu_bo_create(amdgpu_winsys(ws), size, alignment, domain, + struct pb_buffer_lean * res = amdgpu_bo_create(amdgpu_winsys(rws), size, alignment, domain, flags); return res; } @@ -1783,16 +1783,16 @@ uint64_t amdgpu_bo_get_va(struct pb_buffer_lean *buf) } } -static void amdgpu_buffer_destroy(struct radeon_winsys *ws, struct pb_buffer_lean *buf) +static void amdgpu_buffer_destroy(struct radeon_winsys *rws, struct pb_buffer_lean *buf) { struct amdgpu_winsys_bo *bo = amdgpu_winsys_bo(buf); if (bo->type == AMDGPU_BO_SLAB_ENTRY) - amdgpu_bo_slab_destroy(ws, buf); + amdgpu_bo_slab_destroy(rws, buf); else if (bo->type == AMDGPU_BO_SPARSE) - amdgpu_bo_sparse_destroy(ws, buf); + amdgpu_bo_sparse_destroy(rws, buf); else - amdgpu_bo_destroy_or_cache(ws, buf); + amdgpu_bo_destroy_or_cache(rws, buf); } void amdgpu_bo_init_functions(struct amdgpu_screen_winsys *sws) diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.cpp b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.cpp index d8ebe099bb3..627ee7e6769 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.cpp +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.cpp @@ -264,7 +264,7 @@ radeon_to_amdgpu_priority(enum radeon_ctx_priority radeon_priority) } } -static struct radeon_winsys_ctx *amdgpu_ctx_create(struct radeon_winsys *ws, +static struct radeon_winsys_ctx *amdgpu_ctx_create(struct radeon_winsys *rws, enum radeon_ctx_priority priority, bool allow_context_lost) { @@ -277,7 +277,7 @@ static struct radeon_winsys_ctx *amdgpu_ctx_create(struct radeon_winsys *ws, if (!ctx) return NULL; - ctx->ws = amdgpu_winsys(ws); + ctx->ws = amdgpu_winsys(rws); ctx->reference.count = 1; ctx->allow_context_lost = allow_context_lost;