aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian König2017-11-09 03:35:24 -0600
committerChristian König2017-11-09 03:35:44 -0600
commit0c2481edf7a2ce674beaf9ea61a6b19dea2f210b (patch)
tree3f60e3a8fc4afce13f52d5e798a3ed1f543f1cf8
parent6c0ea4b0c5452bfc1e67b74ce723696ef3c80b25 (diff)
downloadexternal-libdrm-0c2481edf7a2ce674beaf9ea61a6b19dea2f210b.tar.gz
external-libdrm-0c2481edf7a2ce674beaf9ea61a6b19dea2f210b.tar.xz
external-libdrm-0c2481edf7a2ce674beaf9ea61a6b19dea2f210b.zip
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.c9
-rw-r--r--include/drm/amdgpu_drm.h4
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,
275 amdgpu_vamgr_init(&dev->vamgr_32, start, max, 275 amdgpu_vamgr_init(&dev->vamgr_32, start, max,
276 dev->dev_info.virtual_address_alignment); 276 dev->dev_info.virtual_address_alignment);
277 277
278 if (dev->dev_info.high_va_offset && dev->dev_info.high_va_max) { 278 start = MAX2(dev->dev_info.virtual_address_offset, 0x100000000ULL);
279 start = dev->dev_info.high_va_offset; 279 max = MAX2(dev->dev_info.virtual_address_max, 0x100000000ULL);
280 max = dev->dev_info.high_va_max;
281 } else {
282 start = MAX2(dev->dev_info.virtual_address_offset, 0x100000000ULL);
283 max = MAX2(dev->dev_info.virtual_address_max, 0x100000000ULL);
284 }
285 amdgpu_vamgr_init(&dev->vamgr, start, max, 280 amdgpu_vamgr_init(&dev->vamgr, start, max,
286 dev->dev_info.virtual_address_alignment); 281 dev->dev_info.virtual_address_alignment);
287 282
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 {
869 __u32 _pad1; 869 __u32 _pad1;
870 /* always on cu bitmap */ 870 /* always on cu bitmap */
871 __u32 cu_ao_bitmap[4][4]; 871 __u32 cu_ao_bitmap[4][4];
872 /** Starting high virtual address for UMDs. */
873 __u64 high_va_offset;
874 /** The maximum high virtual address */
875 __u64 high_va_max;
876}; 872};
877 873
878struct drm_amdgpu_info_hw_ip { 874struct drm_amdgpu_info_hw_ip {