diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-01-11 16:19:29 +0000 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-01-14 11:10:39 +0000 |
commit | c3aef507e1dfe1e483787d501e9907dab67f6bca (patch) | |
tree | 090491285aec8dfbac9197a677cd5dddab49756a | |
parent | 56a730cc086e05545ac447833c8f1766272ab6a7 (diff) |
amd: Use drm_open_driver(AMDGPU)
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@chris-wilson.co.uk>
Cc: Martin Peres <martin.peres@free.fr>
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
-rw-r--r-- | tests/amdgpu/amd_basic.c | 3 | ||||
-rw-r--r-- | tests/amdgpu/amd_cs_nop.c | 3 | ||||
-rw-r--r-- | 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); } |