drm: Branch 'master' - 2 commits

 amdgpu/amdgpu_device.c   |   11 +++--------
 include/drm/amdgpu_drm.h |    4 ----
 2 files changed, 3 insertions(+), 12 deletions(-)

New commits:
commit 931f01964a2f2a75e8563feccc70ac2eb0296d99
Author: Christian König <[email protected]>
Date:   Thu Nov 9 10:36:05 2017 +0100

    Revert "amdgpu: fix 32bit VA manager max address"
    
    This reverts commit 944f6665de36b6a6c36263f23b7b9d1730e544fa.
    
    Accidentially pushed an imcomplete patch.
    
    Signed-off-by: Christian König <[email protected]>

diff --git a/amdgpu/amdgpu_device.c b/amdgpu/amdgpu_device.c
index fa4ab0e7..344e87ed 100644
--- a/amdgpu/amdgpu_device.c
+++ b/amdgpu/amdgpu_device.c
@@ -271,7 +271,7 @@ int amdgpu_device_initialize(int fd,
 	}
 
 	start = dev->dev_info.virtual_address_offset;
-	max = MIN2(dev->dev_info.virtual_address_max, 0x100000000ULL);
+	max = MIN2(dev->dev_info.virtual_address_max, 0xffffffff);
 	amdgpu_vamgr_init(&dev->vamgr_32, start, max,
 			  dev->dev_info.virtual_address_alignment);
 
commit 0c2481edf7a2ce674beaf9ea61a6b19dea2f210b
Author: Christian König <[email protected]>
Date:   Thu Nov 9 10:35:24 2017 +0100

    Revert "amdgpu: use the high VA range if possible"
    
    This reverts commit 6c0ea4b0c5452bfc1e67b74ce723696ef3c80b25.
    
    Accidentially pushed an incomplete patch.
    
    Signed-off-by: Christian König <[email protected]>

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 {

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot

--
_______________________________________________
Dri-patches mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-patches