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

Submitted by Chris Wilson on Jan. 11, 2019, 4:19 p.m.

Details

Message ID 20190111161942.29975-1-chris@chris-wilson.co.uk
State Accepted
Commit c3aef507e1dfe1e483787d501e9907dab67f6bca
Headers show
Series "amd: Use drm_open_driver(AMDGPU)" ( rev: 1 ) in IGT

Not browsing as part of any series.

Commit Message

Chris Wilson Jan. 11, 2019, 4:19 p.m.
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>
---
 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(-)

Patch hide | download patch | download mbox

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);
 	}

Comments

On Fri, Jan 11, 2019 at 04:19:42PM +0000, Chris Wilson wrote:
> 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>

> ---
>  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
> 
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev