[i-g-t,4/4] tests: Enable plane tests for AMDGPU

Submitted by Kazlauskas, Nicholas on Nov. 28, 2018, 2:56 p.m.

Details

Message ID 20181128145620.11850-4-nicholas.kazlauskas@amd.com
State New
Series "Series without cover letter"
Headers show

Commit Message

Kazlauskas, Nicholas Nov. 28, 2018, 2:56 p.m.
The i915 specific feature requirements that would have failed subtests
from kms_plane, kms_plane_multiple and kms_plane_scaling have been
conditionally guarded against. These tests can now be run on AMDGPU
with the i915 specific tests skipped appropriately.

Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
---
 tests/kms_plane.c          | 2 +-
 tests/kms_plane_multiple.c | 2 +-
 tests/kms_plane_scaling.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/tests/kms_plane.c b/tests/kms_plane.c
index 45e0a304..655b0839 100644
--- a/tests/kms_plane.c
+++ b/tests/kms_plane.c
@@ -590,7 +590,7 @@  igt_main
 	igt_skip_on_simulation();
 
 	igt_fixture {
-		data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
+		data.drm_fd = drm_open_driver_master(DRIVER_INTEL | DRIVER_AMDGPU);
 
 		kmstest_set_vt_graphics_mode();
 
diff --git a/tests/kms_plane_multiple.c b/tests/kms_plane_multiple.c
index e67e21a5..41024cb2 100644
--- a/tests/kms_plane_multiple.c
+++ b/tests/kms_plane_multiple.c
@@ -401,7 +401,7 @@  int main(int argc, char *argv[])
 	igt_skip_on_simulation();
 
 	igt_fixture {
-		data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
+		data.drm_fd = drm_open_driver_master(DRIVER_INTEL | DRIVER_AMDGPU);
 		kmstest_set_vt_graphics_mode();
 		igt_require_pipe_crc(data.drm_fd);
 		igt_display_require(&data.display, data.drm_fd);
diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c
index a3bc54fd..de7165ea 100644
--- a/tests/kms_plane_scaling.c
+++ b/tests/kms_plane_scaling.c
@@ -556,7 +556,7 @@  igt_main
 	igt_skip_on_simulation();
 
 	igt_fixture {
-		data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
+		data.drm_fd = drm_open_driver_master(DRIVER_INTEL | DRIVER_AMDGPU);
 		igt_require_pipe_crc(data.drm_fd);
 		igt_display_require(&data.display, data.drm_fd);
 		data.devid = is_i915_device(data.drm_fd) ?

Comments

Wentland, Harry Nov. 29, 2018, 9:54 p.m.
On 2018-11-28 9:56 a.m., Nicholas Kazlauskas wrote:
> The i915 specific feature requirements that would have failed subtests

> from kms_plane, kms_plane_multiple and kms_plane_scaling have been

> conditionally guarded against. These tests can now be run on AMDGPU

> with the i915 specific tests skipped appropriately.

> 

> Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>


Once review for the other patches in this series is settled this one is
Reviewed-by: Harry Wentland <harry.wentland@amd.com>


Harry

> ---

>  tests/kms_plane.c          | 2 +-

>  tests/kms_plane_multiple.c | 2 +-

>  tests/kms_plane_scaling.c  | 2 +-

>  3 files changed, 3 insertions(+), 3 deletions(-)

> 

> diff --git a/tests/kms_plane.c b/tests/kms_plane.c

> index 45e0a304..655b0839 100644

> --- a/tests/kms_plane.c

> +++ b/tests/kms_plane.c

> @@ -590,7 +590,7 @@ igt_main

>  	igt_skip_on_simulation();

>  

>  	igt_fixture {

> -		data.drm_fd = drm_open_driver_master(DRIVER_INTEL);

> +		data.drm_fd = drm_open_driver_master(DRIVER_INTEL | DRIVER_AMDGPU);

>  

>  		kmstest_set_vt_graphics_mode();

>  

> diff --git a/tests/kms_plane_multiple.c b/tests/kms_plane_multiple.c

> index e67e21a5..41024cb2 100644

> --- a/tests/kms_plane_multiple.c

> +++ b/tests/kms_plane_multiple.c

> @@ -401,7 +401,7 @@ int main(int argc, char *argv[])

>  	igt_skip_on_simulation();

>  

>  	igt_fixture {

> -		data.drm_fd = drm_open_driver_master(DRIVER_INTEL);

> +		data.drm_fd = drm_open_driver_master(DRIVER_INTEL | DRIVER_AMDGPU);

>  		kmstest_set_vt_graphics_mode();

>  		igt_require_pipe_crc(data.drm_fd);

>  		igt_display_require(&data.display, data.drm_fd);

> diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c

> index a3bc54fd..de7165ea 100644

> --- a/tests/kms_plane_scaling.c

> +++ b/tests/kms_plane_scaling.c

> @@ -556,7 +556,7 @@ igt_main

>  	igt_skip_on_simulation();

>  

>  	igt_fixture {

> -		data.drm_fd = drm_open_driver_master(DRIVER_INTEL);

> +		data.drm_fd = drm_open_driver_master(DRIVER_INTEL | DRIVER_AMDGPU);

>  		igt_require_pipe_crc(data.drm_fd);

>  		igt_display_require(&data.display, data.drm_fd);

>  		data.devid = is_i915_device(data.drm_fd) ?

>