diff options
| author | Christian König <christian.koenig@amd.com> | 2017-11-07 15:31:45 +0100 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2018-01-09 17:15:09 +0100 |
| commit | 07ea20d5beb24315b721adf83bbfa72ce016e146 (patch) | |
| tree | 32859072439f3ccad03f4daa1005004f542a4b11 /amdgpu | |
| parent | 0a3c01f4ad6a09450e59008085c7bf8151aeb5c4 (diff) | |
amdgpu: use the high VA range if possible v2
Retire the low range on Vega10 this frees up everything below 0xffff800000000000 for HMM.
v2: keep the 32bit range working.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Diffstat (limited to 'amdgpu')
| -rw-r--r-- | amdgpu/amdgpu_device.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/amdgpu/amdgpu_device.c b/amdgpu/amdgpu_device.c index d7077184..a0d01727 100644 --- a/amdgpu/amdgpu_device.c +++ b/amdgpu/amdgpu_device.c @@ -264,13 +264,23 @@ int amdgpu_device_initialize(int fd, goto cleanup; } - start = dev->dev_info.virtual_address_offset; - max = MIN2(dev->dev_info.virtual_address_max, 0x100000000ULL); + if (dev->dev_info.high_va_offset && dev->dev_info.high_va_max) { + start = dev->dev_info.high_va_offset; + max = dev->dev_info.high_va_max; + } else { + start = dev->dev_info.virtual_address_offset; + max = dev->dev_info.virtual_address_max; + } + + max = MIN2(max, (start & ~0xffffffff) + 0x100000000ULL); amdgpu_vamgr_init(&dev->vamgr_32, start, max, dev->dev_info.virtual_address_alignment); - start = MAX2(dev->dev_info.virtual_address_offset, 0x100000000ULL); - max = MAX2(dev->dev_info.virtual_address_max, 0x100000000ULL); + start = max; + if (dev->dev_info.high_va_offset && dev->dev_info.high_va_max) + max = dev->dev_info.high_va_max; + else + max = dev->dev_info.virtual_address_max; amdgpu_vamgr_init(&dev->vamgr, start, max, dev->dev_info.virtual_address_alignment); |