drm: Branch 'master'

 amdgpu/amdgpu_bo.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit f17725108809efaaf139f141808d537d14db3708
Author: Junwei Zhang <[email protected]>
Date:   Thu Aug 30 17:35:40 2018 +0800

    amdgpu: add error return value for finding bo by cpu mapping (v2)
    
    If nothing is found, error should be returned.
    
    v2: udpate the error value different from parameter check
    
    Signed-off-by: Junwei Zhang <[email protected]>
    Reviewed-by: Christian König <[email protected]>
    Reviewed-by: Michel Dänzer <[email protected]>

diff --git a/amdgpu/amdgpu_bo.c b/amdgpu/amdgpu_bo.c
index 2f4f90f6..a2fc5250 100644
--- a/amdgpu/amdgpu_bo.c
+++ b/amdgpu/amdgpu_bo.c
@@ -549,8 +549,9 @@ int amdgpu_find_bo_by_cpu_mapping(amdgpu_device_handle dev,
 				  amdgpu_bo_handle *buf_handle,
 				  uint64_t *offset_in_bo)
 {
-	uint32_t i;
 	struct amdgpu_bo *bo;
+	uint32_t i;
+	int r = 0;
 
 	if (cpu == NULL || size == 0)
 		return -EINVAL;
@@ -577,10 +578,11 @@ int amdgpu_find_bo_by_cpu_mapping(amdgpu_device_handle dev,
 	} else {
 		*buf_handle = NULL;
 		*offset_in_bo = 0;
+		r = -ENXIO;
 	}
 	pthread_mutex_unlock(&dev->bo_table_mutex);
 
-	return 0;
+	return r;
 }
 
 int amdgpu_create_bo_from_user_mem(amdgpu_device_handle dev,

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