diff options
| author | Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> | 2020-05-23 02:01:44 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2020-05-28 11:16:27 -0700 |
| commit | 566eb598f8f003aaad3b8f48e127faa6e49b06fd (patch) | |
| tree | f48c3d619f13b8fab3a1026aafe5ab721261184c | |
| parent | b081c4bb01578a46f10d6703fa96975435f3a7e5 (diff) | |
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 <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5181>
(cherry picked from commit 906435fb0ee3c205c53c67cc641e73182cf5ae4d)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | 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 182482dae67..91348a5ba9d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1372,7 +1372,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 dbc7397ed93..041d6c5e9d7 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c @@ -163,7 +163,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() |