summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2019-11-15 15:09:45 +0200
committerVille Syrjälä <ville.syrjala@linux.intel.com>2021-10-05 13:45:31 +0300
commit13460b8b626b0b377638f84e429f394322646ea4 (patch)
tree35e9ab6d14e3fddf7496f9b93ea33cd801e27035
parentce58d9f20e321c73e88ab2153d35055d90dd14ab (diff)
tests/kms_invalid_mode: Allow the test on !i915
The only i915 specific subtest is the max dotclock check, so let's add the i915 check there and switch from DRIVER_INTEL to DRIVER_ANY so that the other subtests can run everywhere. Reviewed-by: Karthik B S <karthik.b.s@intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
-rw-r--r--tests/kms_invalid_mode.c (renamed from tests/i915/kms_invalid_mode.c)6
-rw-r--r--tests/meson.build2
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/i915/kms_invalid_mode.c b/tests/kms_invalid_mode.c
index 0e2c57c8..d4feba32 100644
--- a/tests/i915/kms_invalid_mode.c
+++ b/tests/kms_invalid_mode.c
@@ -237,6 +237,9 @@ static int i915_max_dotclock(data_t *data)
char *s;
int max_dotclock = 0;
+ if (!is_i915_device(data->drm_fd))
+ return 0;
+
igt_debugfs_read(data->drm_fd, "i915_frequency_info", buf);
s = strstr(buf, "Max pixel clock frequency:");
igt_assert(s);
@@ -296,8 +299,7 @@ static data_t data;
igt_main
{
igt_fixture {
- data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
- igt_require_intel(data.drm_fd);
+ data.drm_fd = drm_open_driver_master(DRIVER_ANY);
kmstest_set_vt_graphics_mode();
diff --git a/tests/meson.build b/tests/meson.build
index 3e3090e5..99557912 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -33,6 +33,7 @@ test_progs = [
'kms_getfb',
'kms_hdmi_inject',
'kms_hdr',
+ 'kms_invalid_mode',
'kms_lease',
'kms_multipipe_modeset',
'kms_panel_fitting',
@@ -228,7 +229,6 @@ i915_progs = [
'kms_flip_scaled_crc',
'kms_flip_tiling',
'kms_frontbuffer_tracking',
- 'kms_invalid_mode',
'kms_legacy_colorkey',
'kms_mmap_write_crc',
'kms_pipe_b_c_ivb',