diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2023-07-05 15:23:24 +0200 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2023-09-04 09:31:36 +0200 |
| commit | ca041d5fe66bd22542dbfd93e991d5aa20950d76 (patch) | |
| tree | aca87f2712984b841b5f5ad2237c5ba361852dbf | |
| parent | 7bdb135f0c8e6ae2c0ed6d4bd6a8423eb1df5c26 (diff) | |
| download | libdrm-ca041d5fe66bd22542dbfd93e991d5aa20950d76.tar.gz libdrm-ca041d5fe66bd22542dbfd93e991d5aa20950d76.tar.bz2 libdrm-ca041d5fe66bd22542dbfd93e991d5aa20950d76.zip | |
amdgpu: Fix pointer/integer mismatch warning
On 32-bit:
../amdgpu/amdgpu_bo.c: In function ‘amdgpu_find_bo_by_cpu_mapping’:
../amdgpu/amdgpu_bo.c:554:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
cpu < (void*)((uintptr_t)bo->cpu_ptr + bo->alloc_size))
^
Indeed, as amdgpu_bo_info.alloc_size is "uint64_t", the sum is
always 64-bit, while "void *" can be 32-bit or 64-bit.
Fix this by casting bo->alloc_size to "size_t", which is either
32-bit or 64-bit, just like "void *".
Fixes: c6493f360e7529c2 ("amdgpu: Eliminate void* arithmetic in amdgpu_find_bo_by_cpu_mapping")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---
v2:
- Add Reviewed-by.
| -rw-r--r-- | amdgpu/amdgpu_bo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/amdgpu/amdgpu_bo.c b/amdgpu/amdgpu_bo.c index f4e04352..672f000d 100644 --- a/amdgpu/amdgpu_bo.c +++ b/amdgpu/amdgpu_bo.c @@ -551,7 +551,7 @@ drm_public int amdgpu_find_bo_by_cpu_mapping(amdgpu_device_handle dev, if (!bo || !bo->cpu_ptr || size > bo->alloc_size) continue; if (cpu >= bo->cpu_ptr && - cpu < (void*)((uintptr_t)bo->cpu_ptr + bo->alloc_size)) + cpu < (void*)((uintptr_t)bo->cpu_ptr + (size_t)bo->alloc_size)) break; } |