diff options
author | Bhanuprakash Modem <bhanuprakash.modem@intel.com> | 2021-09-15 12:09:47 +0530 |
---|---|---|
committer | Bhanuprakash Modem <bhanuprakash.modem@intel.com> | 2021-09-16 16:41:30 +0530 |
commit | fd787fc30408b3c36e31bd6030eec681768a7a69 (patch) | |
tree | 7d08db54d61c56583041108d4db065a6d53102e4 /tests/kms_universal_plane.c | |
parent | 6fecb640dd3d0fd8243992227a6cb09c8029ed01 (diff) |
tests/kms: Move Intel specific kms tests to i915 directory
As KMS tests on IGT are officially supported on multiple SoCs
and there is an active development on it. So, KMS tests are
meant to be generic and if we need to test few things specific
to Intel, we can use igt_require_intel(). But if the whole test
is Intel specific, then the best place for the test would be
tests/i915.
This patch will
* Move all Intel specific kms tests to tests/i915 directory.
* Update the tests those are generic but still open the driver
as 'drm_open_driver_master(DRIVER_INTEL);'.
V2:
* Few more tests
V3:
* Remove cleanups (will submit separate patch later)
* Move few more tests to i915 dir (Karthik)
V4:
* Move kms_big_joiner.c to i915 dir (Karthik)
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Mark Yacoub <markyacoub@chromium.org>
Cc: Petri Latvala <petri.latvala@intel.com>
Cc: Vidya Srinivas <vidya.srinivas@intel.com>
Cc: Karthik B S <karthik.b.s@intel.com>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
Reviewed-by: Mark Yacoub <markyacoub@chromium.org>
Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Reviewed-by: Karthik B S <karthik.b.s@intel.com>
Diffstat (limited to 'tests/kms_universal_plane.c')
-rw-r--r-- | tests/kms_universal_plane.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c index c9a9cd47a..c7b859dac 100644 --- a/tests/kms_universal_plane.c +++ b/tests/kms_universal_plane.c @@ -382,6 +382,7 @@ sanity_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output) * doesn't cover CRTC (should fail on pre-gen9 and succeed on * gen9+). */ + igt_require_intel(data->drm_fd); igt_plane_set_fb(primary, &test.undersized_fb); expect = (data->display_ver < 9) ? -EINVAL : 0; igt_assert(igt_display_try_commit2(&data->display, COMMIT_UNIVERSAL) == expect); @@ -579,6 +580,7 @@ cursor_leak_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output) igt_require_pipe(display, pipe); igt_require(display->has_cursor_plane); + igt_require_intel(data->drm_fd); igt_output_set_pipe(output, pipe); mode = igt_output_get_mode(output); @@ -704,6 +706,7 @@ gen9_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output) int ret = 0; + igt_require_intel(data->drm_fd); igt_skip_on(data->display_ver < 9); igt_require_pipe(&data->display, pipe); @@ -797,8 +800,9 @@ igt_main enum pipe pipe; igt_fixture { - data.drm_fd = drm_open_driver_master(DRIVER_INTEL); - data.display_ver = intel_display_ver(intel_get_drm_devid(data.drm_fd)); + data.drm_fd = drm_open_driver_master(DRIVER_ANY); + if (is_i915_device(data.drm_fd)) + data.display_ver = intel_display_ver(intel_get_drm_devid(data.drm_fd)); kmstest_set_vt_graphics_mode(); |