winsys/amdgpu: clean up code around BO VM alignment

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Marek Olšák 2018-11-23 18:20:49 -05:00
parent 5f9ccf827e
commit 98f2312b4f
1 changed files with 7 additions and 2 deletions

View File

@ -488,10 +488,15 @@ static struct amdgpu_winsys_bo *amdgpu_create_bo(struct amdgpu_winsys *ws,
}
va_gap_size = ws->check_vm ? MAX2(4 * alignment, 64 * 1024) : 0;
unsigned vm_alignment = alignment;
/* Increase the VM alignment for faster address translation. */
if (size > ws->info.pte_fragment_size)
alignment = MAX2(alignment, ws->info.pte_fragment_size);
vm_alignment = MAX2(vm_alignment, ws->info.pte_fragment_size);
r = amdgpu_va_range_alloc(ws->dev, amdgpu_gpu_va_range_general,
size + va_gap_size, alignment, 0, &va, &va_handle,
size + va_gap_size, vm_alignment, 0, &va, &va_handle,
(flags & RADEON_FLAG_32BIT ? AMDGPU_VA_RANGE_32_BIT : 0) |
AMDGPU_VA_RANGE_HIGH);
if (r)