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>

diff --git a/amdgpu/amdgpu_device.c b/amdgpu/amdgpu_device.c
index e04424d..fa4ab0e 100644 (file)
--- 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 a023b47..919248f 100644 (file)
--- 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 {