geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "amdgpu: use the high VA range if possible" 

This reverts commit 6c0ea4b0c5.

Accidentially pushed an incomplete patch.

Signed-off-by: Christian König <christian.koenig@amd.com>
main
Christian König 2017-11-09 10:35:24 +01:00
parent 6c0ea4b0c5
commit 0c2481edf7
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
amdgpu/amdgpu_device.c
View File

@ -275,13 +275,8 @@ int amdgpu_device_initialize(int fd,
amdgpu_vamgr_init(&dev->vamgr_32, start, max, amdgpu_vamgr_init(&dev->vamgr_32, start, max,
dev->dev_info.virtual_address_alignment); 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); start = MAX2(dev->dev_info.virtual_address_offset, 0x100000000ULL);
max = MAX2(dev->dev_info.virtual_address_max, 0x100000000ULL); max = MAX2(dev->dev_info.virtual_address_max, 0x100000000ULL);
}
amdgpu_vamgr_init(&dev->vamgr, start, max, amdgpu_vamgr_init(&dev->vamgr, start, max,
dev->dev_info.virtual_address_alignment); dev->dev_info.virtual_address_alignment);

4
include/drm/amdgpu_drm.h
View File

@ -869,10 +869,6 @@ struct drm_amdgpu_info_device {
__u32 _pad1; __u32 _pad1;
/* always on cu bitmap */ /* always on cu bitmap */
__u32 cu_ao_bitmap[4][4]; __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 { struct drm_amdgpu_info_hw_ip {