drm: Branch 'master'

 amdgpu/amdgpu_bo.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7e4501027cbb6536fbd096d4ba39d39a57a61f2d
Author: Michel Dänzer <[email protected]>
Date:   Wed Jul 11 15:43:59 2018 +0200

    Revert "amdgpu: don't call add_handle_to_table for KMS BO exports"
    
    This reverts commit fe0488aa13c35952b9f3f37ff2c74b6b858e8e73.
    
    It caused messages like
    
     amdgpu 0000:23:00.0: bo 000000007dce0b3e va 0x0000101800-0x000010181f conflict with 0x0000101800-0x0000101820
    
    in dmesg, and eventually a Xorg crash while running piglit.
    
    Evidently, such BOs can actually be re-imported by other means than via
    a KMS handle.

diff --git a/amdgpu/amdgpu_bo.c b/amdgpu/amdgpu_bo.c
index 9e7f9589..9e37b149 100644
--- a/amdgpu/amdgpu_bo.c
+++ b/amdgpu/amdgpu_bo.c
@@ -240,7 +240,7 @@ int amdgpu_bo_export(amdgpu_bo_handle bo,
 		return 0;
 
 	case amdgpu_bo_handle_type_kms:
-		/* Don't add the handle to the hash table. It can't be reimported. */
+		amdgpu_add_handle_to_table(bo);
 		*shared_handle = bo->handle;
 		return 0;
 

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