Mesa (master): radv/winsys: use drmGetDevice2 API

[Emil Velikov]

Module: Mesa
Branch: master
Commit: 8ff2937dfa60dd86ed0ee0b5bfb3d80f5ab0ae7e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8ff2937dfa60dd86ed0ee0b5bfb3d80f5ab0ae7e

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Thu Dec  1 19:53:11 2016 +0000

radv/winsys: use drmGetDevice2 API

Analogous to previous commit

v2: Add explicit require_libdrm check.

Cc: Dave Airlie <airlied at redhat.com>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com> (v1)
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl> (v1)
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com> (v1)
Tested-by: Mike Lothian <mike at fireburn.co.uk>

---

 configure.ac                                      | 1 +
 src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6b65ff8..a006976 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1792,6 +1792,7 @@ if test -n "$with_vulkan_drivers"; then
 
             ;;
         xradeon)
+            require_libdrm "radv"
             PKG_CHECK_MODULES([AMDGPU], [libdrm >= $LIBDRM_AMDGPU_REQUIRED libdrm_amdgpu >= $LIBDRM_AMDGPU_REQUIRED])
             radeon_llvm_check $LLVM_REQUIRED_RADV "radv"
             HAVE_RADEON_VULKAN=yes
diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
index c9f5235..783567f 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
@@ -124,9 +124,9 @@ do_winsys_init(struct radv_amdgpu_winsys *ws, int fd)
 	int r;
 	int i, j;
 	/* Get PCI info. */
-	r = drmGetDevice(fd, &devinfo);
+	r = drmGetDevice2(fd, 0, &devinfo);
 	if (r) {
-		fprintf(stderr, "amdgpu: drmGetDevice failed.\n");
+		fprintf(stderr, "amdgpu: drmGetDevice2 failed.\n");
 		goto fail;
 	}
 	ws->info.pci_domain = devinfo->businfo.pci->domain;