[igt-dev] [PATCH i-g-t 4/4] tests: Enable plane tests for AMDGPU

Nicholas Kazlauskas
2018-11-13T15:24:04Z

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(-)

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 7c8adf94..60b9fc07 100644
--- a/tests/kms_plane_multiple.c
+++ b/tests/kms_plane_multiple.c
@@ -398,7 +398,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 ee29f11e..14723106 100644
--- a/tests/kms_plane_scaling.c
+++ b/tests/kms_plane_scaling.c
@@ -553,7 +553,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) ?
--
2.17.1