diff options
| author | Christian König <christian.koenig@amd.com> | 2017-11-09 10:35:24 +0100 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2017-11-09 10:35:44 +0100 |
| commit | 0c2481edf7a2ce674beaf9ea61a6b19dea2f210b (patch) | |
| tree | 3f60e3a8fc4afce13f52d5e798a3ed1f543f1cf8 | |
| parent | 6c0ea4b0c5452bfc1e67b74ce723696ef3c80b25 (diff) | |
Revert "amdgpu: use the high VA range if possible"
This reverts commit 6c0ea4b0c5452bfc1e67b74ce723696ef3c80b25.
Accidentially pushed an incomplete patch.
Signed-off-by: Christian König <christian.koenig@amd.com>
| -rw-r--r-- | amdgpu/amdgpu_device.c | 9 | ||||
| -rw-r--r-- | include/drm/amdgpu_drm.h | 4 |
2 files changed, 2 insertions, 11 deletions
diff --git a/amdgpu/amdgpu_device.c b/amdgpu/amdgpu_device.c index e04424d3..fa4ab0e7 100644 --- a/amdgpu/amdgpu_device.c +++ b/amdgpu/amdgpu_device.c @@ -275,13 +275,8 @@ int amdgpu_device_initialize(int fd, amdgpu_vamgr_init(&dev->vamgr_32, start, max, dev->dev_info.virtual_address_alignment); - 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 = MAX2(dev->dev_info.virtual_address_offset, 0x100000000ULL); - max = MAX2(dev->dev_info.virtual_address_max, 0x100000000ULL); - } + start = MAX2(dev->dev_info.virtual_address_offset, 0x100000000ULL); + max = MAX2(dev->dev_info.virtual_address_max, 0x100000000ULL); amdgpu_vamgr_init(&dev->vamgr, start, max, dev->dev_info.virtual_address_alignment); diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h index a023b476..919248fb 100644 --- a/include/drm/amdgpu_drm.h +++ b/include/drm/amdgpu_drm.h @@ -869,10 +869,6 @@ struct drm_amdgpu_info_device { __u32 _pad1; /* always on cu bitmap */ __u32 cu_ao_bitmap[4][4]; - /** Starting high virtual address for UMDs. */ - __u64 high_va_offset; - /** The maximum high virtual address */ - __u64 high_va_max; }; struct drm_amdgpu_info_hw_ip { |