From 167d4a59936d4793a2638cb2b665620e75a7ba02 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Sat, 23 May 2020 02:01:44 +0200 Subject: [PATCH] radv/winsys: Remove extra sizeof multiply. The pointer is already uint64_t*, so the sizeof was too much ... Fixes: eeff7e11544 "radv: Add userspace fence buffer per context." Reviewed-by: Samuel Pitoiset Part-of: (cherry picked from commit 906435fb0ee3c205c53c67cc641e73182cf5ae4d) --- .pick_status.json | 2 +- src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index da86515e8b2..d31dd0d4c41 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -886,7 +886,7 @@ "description": "radv/winsys: Remove extra sizeof multiply.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "eeff7e11544f333d211c8f8ad3679db814050cfa" }, diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c index de6bd6546ed..87defbd698b 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c @@ -164,7 +164,7 @@ static void radv_amdgpu_request_to_fence(struct radv_amdgpu_ctx *ctx, fence->fence.ip_instance = req->ip_instance; fence->fence.ring = req->ring; fence->fence.fence = req->seq_no; - fence->user_ptr = (volatile uint64_t*)(ctx->fence_map + (req->ip_type * MAX_RINGS_PER_TYPE + req->ring) * sizeof(uint64_t)); + fence->user_ptr = (volatile uint64_t*)(ctx->fence_map + req->ip_type * MAX_RINGS_PER_TYPE + req->ring); } static struct radeon_winsys_fence *radv_amdgpu_create_fence()