drm: Branch 'master'

[email protected] (Christian K??nig) Wed, 28 Feb 2018 19:05:21 +0000 (UTC)
Newsgroups gmane.comp.video.dri.patches
Message-ID <[email protected]>
 amdgpu/amdgpu_device.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bca585b02f09e27d7adef8375630515711bd4802
Author: Christian König <[email protected]>
Date:   Wed Feb 28 15:39:46 2018 +0100

    amdgpu: fix "add AMDGPU_VA_RANGE_HIGH"
    
    The range is stored as exclusive, not inclusive. Subtracts one to get
    the inclusive interval for the calculation. This fixes crashes when 32bit
    addresses are in use.
    
    Signed-off-by: Christian König <[email protected]>
    Reviewed-and-Tested-by: Michel Dänzer <[email protected]>

diff --git a/amdgpu/amdgpu_device.c b/amdgpu/amdgpu_device.c
index 9ff6ad16..fb2cfb57 100644
--- a/amdgpu/amdgpu_device.c
+++ b/amdgpu/amdgpu_device.c
@@ -323,9 +323,9 @@ int amdgpu_query_sw_info(amdgpu_device_handle dev, enum amdgpu_sw_info info,
 	switch (info) {
 	case amdgpu_sw_info_address32_hi:
 		if (dev->vamgr_high_32.va_max)
-			*val32 = dev->vamgr_high_32.va_max >> 32;
+			*val32 = (dev->vamgr_high_32.va_max - 1) >> 32;
 		else
-			*val32 = dev->vamgr_32.va_max >> 32;
+			*val32 = (dev->vamgr_32.va_max - 1) >> 32;
 		return 0;
 	}
 	return -EINVAL;

------------------------------------------------------------------------------
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