[igt-dev] [PATCH i-g-t] amd: Use drm_open_driver(AMDGPU)

Chris Wilson chris at chris-wilson.co.uk
Fri Jan 11 16:19:42 UTC 2019


Just use the normal library function, with the normal warning message
for an unmatched GPU so that CI buglog can filter it.

References: https://bugs.freedesktop.org/show_bug.cgi?id=109315
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Martin Peres <martin.peres at free.fr>
---
 tests/amdgpu/amd_basic.c  | 3 +--
 tests/amdgpu/amd_cs_nop.c | 3 +--
 tests/amdgpu/amd_prime.c  | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/amdgpu/amd_basic.c b/tests/amdgpu/amd_basic.c
index 9f21de65b..d3c060e32 100644
--- a/tests/amdgpu/amd_basic.c
+++ b/tests/amdgpu/amd_basic.c
@@ -1384,8 +1384,7 @@ igt_main
 		uint32_t major, minor;
 		int err;
 
-		fd = __drm_open_driver(DRIVER_AMDGPU);
-		igt_require(fd >= 0);
+		fd = drm_open_driver(DRIVER_AMDGPU);
 
 		err = amdgpu_device_initialize(fd, &major, &minor, &device);
 		igt_require(err == 0);
diff --git a/tests/amdgpu/amd_cs_nop.c b/tests/amdgpu/amd_cs_nop.c
index c5ea66aa5..46f4b7c65 100644
--- a/tests/amdgpu/amd_cs_nop.c
+++ b/tests/amdgpu/amd_cs_nop.c
@@ -219,8 +219,7 @@ igt_main
 		uint32_t major, minor;
 		int err;
 
-		fd = __drm_open_driver(DRIVER_AMDGPU);
-		igt_require(fd >= 0);
+		fd = drm_open_driver(DRIVER_AMDGPU);
 
 		err = amdgpu_device_initialize(fd, &major, &minor, &device);
 		igt_require(err == 0);
diff --git a/tests/amdgpu/amd_prime.c b/tests/amdgpu/amd_prime.c
index 518c88963..dc71ac70c 100644
--- a/tests/amdgpu/amd_prime.c
+++ b/tests/amdgpu/amd_prime.c
@@ -437,7 +437,7 @@ igt_main
 		igt_require_gem(i915);
 		igt_require(gem_has_exec_fence(i915));
 
-		amd = __drm_open_driver(DRIVER_AMDGPU);
+		amd = drm_open_driver(DRIVER_AMDGPU);
 		err = amdgpu_device_initialize(amd, &major, &minor, &device);
 		igt_require(err == 0);
 	}
-- 
2.20.1



More information about the igt-dev mailing list