geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

amdgpu: Eliminate void* arithmetic in amdgpu_find_bo_by_cpu_mapping 

Arithmetic using void* pointers isn't defined by the C standard, only as
a GCC extension. Avoids compiler warnings:

../../amdgpu/amdgpu_bo.c: In function ‘amdgpu_find_bo_by_cpu_mapping’:
../../amdgpu/amdgpu_bo.c:554:48: warning: pointer of type ‘void *’ used in arithmetic [-Wpointer-arith]
   if (cpu >= bo->cpu_ptr && cpu < (bo->cpu_ptr + bo->alloc_size))
                                                ^
../../amdgpu/amdgpu_bo.c:561:23: warning: pointer of type ‘void *’ used in subtraction [-Wpointer-arith]
   *offset_in_bo = cpu - bo->cpu_ptr;
                       ^

v2: Use uintptr_t instead of char*, don't change function signature
    (Junwei Zhang)

Fixes: 4d454424e1 ("amdgpu: add a function to find bo by cpu mapping
                     (v2)")
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
main
Michel Dänzer 2018-08-14 11:53:19 +02:00 committed by Michel Dänzer
parent cc472c5bb3
commit c6493f360e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
amdgpu/amdgpu_bo.c
View File

@ -551,14 +551,15 @@ int amdgpu_find_bo_by_cpu_mapping(amdgpu_device_handle dev,
bo = handle_table_lookup(&dev->bo_handles, i); bo = handle_table_lookup(&dev->bo_handles, i);
if (!bo || !bo->cpu_ptr || size > bo->alloc_size) if (!bo || !bo->cpu_ptr || size > bo->alloc_size)
continue; continue;
if (cpu >= bo->cpu_ptr && cpu < (bo->cpu_ptr + bo->alloc_size)) if (cpu >= bo->cpu_ptr &&
cpu < (void*)((uintptr_t)bo->cpu_ptr + bo->alloc_size))
break; break;
} }
if (i < dev->bo_handles.max_key) { if (i < dev->bo_handles.max_key) {
atomic_inc(&bo->refcount); atomic_inc(&bo->refcount);
*buf_handle = bo; *buf_handle = bo;
*offset_in_bo = cpu - bo->cpu_ptr; *offset_in_bo = (uintptr_t)cpu - (uintptr_t)bo->cpu_ptr;
} else { } else {
*buf_handle = NULL; *buf_handle = NULL;
*offset_in_bo = 0; *offset_in_bo = 0;