drm: Branch 'master'

 amdgpu/amdgpu-symbol-check |    2 +-
 amdgpu/amdgpu.h            |    5 +----
 amdgpu/amdgpu_bo.c         |    3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 580bd83fb4f242d59d18dcc18d47cbf6a9b12df7
Author: Qiang Yu <[email protected]>
Date:   Mon Sep 3 18:06:02 2018 +0800

    amdgpu: amdgpu_bo_inc_ref don't return dummy int
    
    Signed-off-by: Qiang Yu <[email protected]>
    Reviewed-by: Michel Dänzer <[email protected]>
    Reviewed-by: Christian König <[email protected]>

diff --git a/amdgpu/amdgpu-symbol-check b/amdgpu/amdgpu-symbol-check
index 487610e0..58646e85 100755
--- a/amdgpu/amdgpu-symbol-check
+++ b/amdgpu/amdgpu-symbol-check
@@ -15,8 +15,8 @@ amdgpu_bo_cpu_map
 amdgpu_bo_cpu_unmap
 amdgpu_bo_export
 amdgpu_bo_free
-amdgpu_bo_inc_ref
 amdgpu_bo_import
+amdgpu_bo_inc_ref
 amdgpu_bo_list_create
 amdgpu_bo_list_destroy
 amdgpu_bo_list_update
diff --git a/amdgpu/amdgpu.h b/amdgpu/amdgpu.h
index e1f93f8e..dc51659a 100644
--- a/amdgpu/amdgpu.h
+++ b/amdgpu/amdgpu.h
@@ -725,13 +725,10 @@ int amdgpu_bo_free(amdgpu_bo_handle buf_handle);
  *
  * \param   bo - \c [in]  Buffer object handle to increase the reference count
  *
- * \return   0 on success\n
- *          <0 - Negative POSIX Error code
- *
  * \sa amdgpu_bo_alloc(), amdgpu_bo_free()
  *
 */
-int amdgpu_bo_inc_ref(amdgpu_bo_handle bo);
+void amdgpu_bo_inc_ref(amdgpu_bo_handle bo);
 
 /**
  * Request CPU access to GPU accessable memory
diff --git a/amdgpu/amdgpu_bo.c b/amdgpu/amdgpu_bo.c
index dceab010..6a95929c 100644
--- a/amdgpu/amdgpu_bo.c
+++ b/amdgpu/amdgpu_bo.c
@@ -438,10 +438,9 @@ int amdgpu_bo_free(amdgpu_bo_handle buf_handle)
 	return 0;
 }
 
-int amdgpu_bo_inc_ref(amdgpu_bo_handle bo)
+void amdgpu_bo_inc_ref(amdgpu_bo_handle bo)
 {
 	atomic_inc(&bo->refcount);
-	return 0;
 }
 
 int amdgpu_bo_cpu_map(amdgpu_bo_handle bo, void **cpu)

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