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

amdpgu: fix coding style in amdgpu_vamgr.c 

No functional change.

Signed-off-by: Christian König <christian.koenig@amd.com>
main
Christian König 2017-11-02 18:47:34 +01:00
parent cfe0ae5355
commit 4b4ccaac2e
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
amdgpu/amdgpu_vamgr.c
View File

@ -34,18 +34,19 @@
#include "util_math.h" #include "util_math.h"
int amdgpu_va_range_query(amdgpu_device_handle dev, int amdgpu_va_range_query(amdgpu_device_handle dev,
enum amdgpu_gpu_va_range type, uint64_t *start, uint64_t *end) enum amdgpu_gpu_va_range type,
uint64_t *start, uint64_t *end)
{ {
if (type == amdgpu_gpu_va_range_general) { if (type != amdgpu_gpu_va_range_general)
*start = dev->dev_info.virtual_address_offset; return -EINVAL;
*end = dev->dev_info.virtual_address_max;
return 0; *start = dev->dev_info.virtual_address_offset;
} *end = dev->dev_info.virtual_address_max;
return -EINVAL; return 0;
} }
drm_private void amdgpu_vamgr_init(struct amdgpu_bo_va_mgr *mgr, uint64_t start, drm_private void amdgpu_vamgr_init(struct amdgpu_bo_va_mgr *mgr, uint64_t start,
uint64_t max, uint64_t alignment) uint64_t max, uint64_t alignment)
{ {
mgr->va_offset = start; mgr->va_offset = start;
mgr->va_max = max; mgr->va_max = max;
@ -83,8 +84,8 @@ amdgpu_vamgr_find_va(struct amdgpu_bo_va_mgr *mgr, uint64_t size,
/* first look for a hole */ /* first look for a hole */
LIST_FOR_EACH_ENTRY_SAFE(hole, n, &mgr->va_holes, list) { LIST_FOR_EACH_ENTRY_SAFE(hole, n, &mgr->va_holes, list) {
if (base_required) { if (base_required) {
if(hole->offset > base_required || if (hole->offset > base_required ||
(hole->offset + hole->size) < (base_required + size)) (hole->offset + hole->size) < (base_required + size))
continue; continue;
waste = base_required - hole->offset; waste = base_required - hole->offset;
offset = base_required; offset = base_required;
@ -192,9 +193,9 @@ amdgpu_vamgr_free_va(struct amdgpu_bo_va_mgr *mgr, uint64_t va, uint64_t size)
hole->offset = va; hole->offset = va;
hole->size += size; hole->size += size;
/* Merge lower hole if it's adjacent */ /* Merge lower hole if it's adjacent */
if (next != hole if (next != hole &&
&& &next->list != &mgr->va_holes &next->list != &mgr->va_holes &&
&& (next->offset + next->size) == va) { (next->offset + next->size) == va) {
next->size += hole->size; next->size += hole->size;
list_del(&hole->list); list_del(&hole->list);
free(hole); free(hole);