drm: Branch 'master'

 amdgpu/meson.build |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 649d4e60fa0f2e98a48141588f373d12fb3e6e9c
Author: Mike Lothian <[email protected]>
Date:   Tue Aug 7 13:38:09 2018 +0100

    libdrm: Fix amdgpu build failure
    
    Use the correct files to build libdrm_amdgpu.
    
    Signed-of-by: Mike Lothian <[email protected]>
    Fixes: d6cb0ee408e ("amdgpu: remove the hash table implementation")
    Cc: Christian König <[email protected]>
    Reviewed-by: Emil Velikov <[email protected]>

diff --git a/amdgpu/meson.build b/amdgpu/meson.build
index f39d7bf6..d9d7de2d 100644
--- a/amdgpu/meson.build
+++ b/amdgpu/meson.build
@@ -26,8 +26,7 @@ libdrm_amdgpu = shared_library(
   [
     files(
       'amdgpu_asic_id.c', 'amdgpu_bo.c', 'amdgpu_cs.c', 'amdgpu_device.c',
-      'amdgpu_gpu_info.c', 'amdgpu_vamgr.c', 'amdgpu_vm.c', 'util_hash.c',
-      'util_hash_table.c',
+      'amdgpu_gpu_info.c', 'amdgpu_vamgr.c', 'amdgpu_vm.c', 'handle_table.c',
     ),
     config_file,
   ],

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