[igt-dev] [PATCH 2/7] tests/i915/kms: remove igt_skip_on_simulation()

Swati Sharma
2019-10-16T07:58:10Z

Removing igt_skip_on_simulation() from all the kms tests
since this feature is not supported anymore.

Signed-off-by: Swati Sharma <swati2.sharma@intel.com>
Signed-off-by: Karthik B S <karthik.b.s@intel.com>
---
tests/kms_atomic_interruptible.c | 2 --
tests/kms_atomic_transition.c | 2 --
tests/kms_available_modes_crc.c | 2 --
tests/kms_big_fb.c | 2 --
tests/kms_busy.c | 2 --
tests/kms_chamelium.c | 2 --
tests/kms_color.c | 2 --
tests/kms_concurrent.c | 2 --
tests/kms_content_protection.c | 2 --
tests/kms_crtc_background_color.c | 2 --
tests/kms_cursor_crc.c | 2 --
tests/kms_cursor_edge_walk.c | 2 --
tests/kms_fence_pin_leak.c | 2 --
tests/kms_flip_event_leak.c | 2 --
tests/kms_flip_tiling.c | 2 --
tests/kms_invalid_dotclock.c | 2 --
tests/kms_legacy_colorkey.c | 2 --
tests/kms_mmap_write_crc.c | 2 --
tests/kms_panel_fitting.c | 2 --
tests/kms_pipe_b_c_ivb.c | 2 --
tests/kms_pipe_crc_basic.c | 2 --
tests/kms_plane.c | 2 --
tests/kms_plane_cursor.c | 2 --
tests/kms_plane_lowres.c | 2 --
tests/kms_plane_multiple.c | 2 --
tests/kms_plane_scaling.c | 2 --
tests/kms_properties.c | 2 --
tests/kms_psr.c | 2 --
tests/kms_psr2_su.c | 2 --
tests/kms_pwrite_crc.c | 2 --
tests/kms_rmfb.c | 2 --
tests/kms_rotation_crc.c | 2 --
tests/kms_sequence.c | 2 --
tests/kms_setmode.c | 2 --
tests/kms_universal_plane.c | 2 --
tests/kms_vblank.c | 2 --
tests/kms_vrr.c | 2 --
37 files changed, 74 deletions(-)

diff --git a/tests/kms_atomic_interruptible.c b/tests/kms_atomic_interruptible.c
index be688638..e5ccdf5b 100644
--- a/tests/kms_atomic_interruptible.c
+++ b/tests/kms_atomic_interruptible.c
@@ -272,8 +272,6 @@ igt_main
igt_output_t *output;
enum pipe pipe;

- igt_skip_on_simulation();
-
igt_fixture {
display.drm_fd = drm_open_driver_master(DRIVER_ANY);

diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c
index 1540daa2..44f01109 100644
--- a/tests/kms_atomic_transition.c
+++ b/tests/kms_atomic_transition.c
@@ -909,8 +909,6 @@ igt_main
enum pipe pipe;
int i;

- igt_skip_on_simulation();
-
igt_fixture {
display.drm_fd = drm_open_driver_master(DRIVER_ANY);

diff --git a/tests/kms_available_modes_crc.c b/tests/kms_available_modes_crc.c
index 786d50e6..d1b7b517 100644
--- a/tests/kms_available_modes_crc.c
+++ b/tests/kms_available_modes_crc.c
@@ -438,8 +438,6 @@ igt_main
{
data_t data = {};

- igt_skip_on_simulation();
-
igt_fixture {
data.gfx_fd = drm_open_driver_master(DRIVER_INTEL);
kmstest_set_vt_graphics_mode();
diff --git a/tests/kms_big_fb.c b/tests/kms_big_fb.c
index c3498c67..c5d002ca 100644
--- a/tests/kms_big_fb.c
+++ b/tests/kms_big_fb.c
@@ -605,8 +605,6 @@ igt_main
igt_fixture {
drmModeResPtr res;

- igt_skip_on_simulation();
-
data.drm_fd = drm_open_driver_master(DRIVER_INTEL);

igt_require(is_i915_device(data.drm_fd));
diff --git a/tests/kms_busy.c b/tests/kms_busy.c
index 5ff2b846..e558055b 100644
--- a/tests/kms_busy.c
+++ b/tests/kms_busy.c
@@ -290,8 +290,6 @@ igt_main
const struct intel_execution_engine *e = &intel_execution_engines[1];
enum pipe n;

- igt_skip_on_simulation();
-
igt_fixture {
int fd = drm_open_driver_master(DRIVER_INTEL);

diff --git a/tests/kms_chamelium.c b/tests/kms_chamelium.c
index 52330098..b35ccf0e 100644
--- a/tests/kms_chamelium.c
+++ b/tests/kms_chamelium.c
@@ -2615,8 +2615,6 @@ igt_main
size_t i;

igt_fixture {
- igt_skip_on_simulation();
-
data.drm_fd = drm_open_driver_master(DRIVER_ANY);
data.chamelium = chamelium_init(data.drm_fd);
igt_require(data.chamelium);
diff --git a/tests/kms_color.c b/tests/kms_color.c
index eb85df7d..b4b578a7 100644
--- a/tests/kms_color.c
+++ b/tests/kms_color.c
@@ -1212,8 +1212,6 @@ igt_main
data_t data = {};
enum pipe pipe;

- igt_skip_on_simulation();
-
igt_fixture {
data.drm_fd = drm_open_driver_master(DRIVER_INTEL | DRIVER_AMDGPU);
if (is_i915_device(data.drm_fd))
diff --git a/tests/kms_concurrent.c b/tests/kms_concurrent.c
index 23b05ea1..a0280d15 100644
--- a/tests/kms_concurrent.c
+++ b/tests/kms_concurrent.c
@@ -393,8 +393,6 @@ igt_main_args("", long_options, help_str, opt_handler, NULL)
{
enum pipe pipe;

- igt_skip_on_simulation();
-
igt_fixture {
data.drm_fd = drm_open_driver_master(DRIVER_ANY);
kmstest_set_vt_graphics_mode();
diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c
index fce4b591..82c146d8 100644
--- a/tests/kms_content_protection.c
+++ b/tests/kms_content_protection.c
@@ -640,8 +640,6 @@ static void test_content_protection_cleanup(void)
igt_main
{
igt_fixture {
- igt_skip_on_simulation();
-
data.drm_fd = drm_open_driver(DRIVER_ANY);

igt_display_require(&data.display, data.drm_fd);
diff --git a/tests/kms_crtc_background_color.c b/tests/kms_crtc_background_color.c
index 3df3401f..aca7ac3e 100644
--- a/tests/kms_crtc_background_color.c
+++ b/tests/kms_crtc_background_color.c
@@ -176,8 +176,6 @@ igt_simple_main
{
data_t data = {};

- igt_skip_on_simulation();
-
data.gfx_fd = drm_open_driver(DRIVER_INTEL);
igt_require_pipe_crc(data.gfx_fd);
igt_display_require(&data.display, data.gfx_fd);
diff --git a/tests/kms_cursor_crc.c b/tests/kms_cursor_crc.c
index d0fb8f1d..245ff7b2 100644
--- a/tests/kms_cursor_crc.c
+++ b/tests/kms_cursor_crc.c
@@ -710,8 +710,6 @@ igt_main
int ret;
enum pipe pipe;

- igt_skip_on_simulation();
-
igt_fixture {
data.drm_fd = drm_open_driver_master(DRIVER_ANY);

diff --git a/tests/kms_cursor_edge_walk.c b/tests/kms_cursor_edge_walk.c
index 87d17e06..6feb32a8 100644
--- a/tests/kms_cursor_edge_walk.c
+++ b/tests/kms_cursor_edge_walk.c
@@ -304,8 +304,6 @@ static const char *help_str =

igt_main_args("", long_opts, help_str, opt_handler, &data)
{
- igt_skip_on_simulation();
-
igt_fixture {
int ret;

diff --git a/tests/kms_fence_pin_leak.c b/tests/kms_fence_pin_leak.c
index e6c8b33c..8c9e10a5 100644
--- a/tests/kms_fence_pin_leak.c
+++ b/tests/kms_fence_pin_leak.c
@@ -198,8 +198,6 @@ igt_simple_main
drm_intel_context *ctx;
data_t data = {};

- igt_skip_on_simulation();
-
data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
igt_require_gem(data.drm_fd);

diff --git a/tests/kms_flip_event_leak.c b/tests/kms_flip_event_leak.c
index f29d41fa..06b62d17 100644
--- a/tests/kms_flip_event_leak.c
+++ b/tests/kms_flip_event_leak.c
@@ -96,8 +96,6 @@ igt_simple_main
int valid_tests = 0;
enum pipe pipe;

- igt_skip_on_simulation();
-
data.drm_fd = drm_open_driver_master(DRIVER_ANY);
kmstest_set_vt_graphics_mode();

diff --git a/tests/kms_flip_tiling.c b/tests/kms_flip_tiling.c
index 7c8accc3..17cf816d 100644
--- a/tests/kms_flip_tiling.c
+++ b/tests/kms_flip_tiling.c
@@ -151,8 +151,6 @@ igt_output_t *output;

igt_main
{
- igt_skip_on_simulation();
-
igt_fixture {
data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
data.gen = intel_gen(intel_get_drm_devid(data.drm_fd));
diff --git a/tests/kms_invalid_dotclock.c b/tests/kms_invalid_dotclock.c
index 275007df..402629ab 100644
--- a/tests/kms_invalid_dotclock.c
+++ b/tests/kms_invalid_dotclock.c
@@ -126,8 +126,6 @@ static data_t data;

igt_simple_main
{
- igt_skip_on_simulation();
-
data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
igt_require_intel(data.drm_fd);

diff --git a/tests/kms_legacy_colorkey.c b/tests/kms_legacy_colorkey.c
index 961aa0a3..de9610a7 100644
--- a/tests/kms_legacy_colorkey.c
+++ b/tests/kms_legacy_colorkey.c
@@ -45,8 +45,6 @@ static void test_plane(uint32_t plane_id, int expected_ret)

igt_simple_main
{
- igt_skip_on_simulation();
-
drm_fd = drm_open_driver_master(DRIVER_INTEL);

kmstest_set_vt_graphics_mode();
diff --git a/tests/kms_mmap_write_crc.c b/tests/kms_mmap_write_crc.c
index 73606b16..56e0c4d7 100644
--- a/tests/kms_mmap_write_crc.c
+++ b/tests/kms_mmap_write_crc.c
@@ -271,8 +271,6 @@ igt_main_args("n", NULL, NULL, opt_handler, NULL)
{
int i;

- igt_skip_on_simulation();
-
igt_fixture {
data.drm_fd = drm_open_driver_master(DRIVER_INTEL);

diff --git a/tests/kms_panel_fitting.c b/tests/kms_panel_fitting.c
index a942294b..ac24730f 100644
--- a/tests/kms_panel_fitting.c
+++ b/tests/kms_panel_fitting.c
@@ -252,8 +252,6 @@ igt_main
data_t data = {};

igt_fixture {
- igt_skip_on_simulation();
-
data.drm_fd = drm_open_driver(DRIVER_ANY);
igt_display_require(&data.display, data.drm_fd);
igt_display_require_output(&data.display);
diff --git a/tests/kms_pipe_b_c_ivb.c b/tests/kms_pipe_b_c_ivb.c
index fe2250ce..94768eec 100644
--- a/tests/kms_pipe_b_c_ivb.c
+++ b/tests/kms_pipe_b_c_ivb.c
@@ -255,8 +255,6 @@ igt_main
{
int devid;

- igt_skip_on_simulation();
-
igt_fixture {
data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
devid = intel_get_drm_devid(data.drm_fd);
diff --git a/tests/kms_pipe_crc_basic.c b/tests/kms_pipe_crc_basic.c
index 36ce624e..d169b7bd 100644
--- a/tests/kms_pipe_crc_basic.c
+++ b/tests/kms_pipe_crc_basic.c
@@ -173,8 +173,6 @@ igt_main
igt_subtest("bad-source")
test_bad_source(&data);

- igt_skip_on_simulation();
-
for_each_pipe_static(pipe) {
igt_subtest_f("read-crc-pipe-%s", kmstest_pipe_name(pipe))
test_read_crc(&data, pipe, 0);
diff --git a/tests/kms_plane.c b/tests/kms_plane.c
index 5f1a73f8..acd2a3b9 100644
--- a/tests/kms_plane.c
+++ b/tests/kms_plane.c
@@ -831,8 +831,6 @@ igt_main
{
enum pipe pipe;

- igt_skip_on_simulation();
-
igt_fixture {
data.drm_fd = drm_open_driver_master(DRIVER_ANY);

diff --git a/tests/kms_plane_cursor.c b/tests/kms_plane_cursor.c
index cbad0041..adcdf5e8 100644
--- a/tests/kms_plane_cursor.c
+++ b/tests/kms_plane_cursor.c
@@ -306,8 +306,6 @@ igt_main
enum pipe pipe;
int i;

- igt_skip_on_simulation();
-
igt_fixture {
data.drm_fd = drm_open_driver_master(DRIVER_ANY);

diff --git a/tests/kms_plane_lowres.c b/tests/kms_plane_lowres.c
index 1a316c84..c6c3f498 100644
--- a/tests/kms_plane_lowres.c
+++ b/tests/kms_plane_lowres.c
@@ -233,8 +233,6 @@ igt_main
data_t data = {};
enum pipe pipe;

- igt_skip_on_simulation();
-
igt_fixture {
data.drm_fd = drm_open_driver_master(DRIVER_ANY);

diff --git a/tests/kms_plane_multiple.c b/tests/kms_plane_multiple.c
index 255cd34a..899b6c5e 100644
--- a/tests/kms_plane_multiple.c
+++ b/tests/kms_plane_multiple.c
@@ -433,8 +433,6 @@ igt_main_args("", long_options, help_str, opt_handler, NULL)
{
enum pipe pipe;

- igt_skip_on_simulation();
-
igt_fixture {
data.drm_fd = drm_open_driver_master(DRIVER_INTEL | DRIVER_AMDGPU);
kmstest_set_vt_graphics_mode();
diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c
index 0bd36904..35aac8da 100644
--- a/tests/kms_plane_scaling.c
+++ b/tests/kms_plane_scaling.c
@@ -624,8 +624,6 @@ igt_main
data_t data = {};
enum pipe pipe;

- igt_skip_on_simulation();
-
igt_fixture {
data.drm_fd = drm_open_driver_master(DRIVER_INTEL | DRIVER_AMDGPU);
igt_display_require(&data.display, data.drm_fd);
diff --git a/tests/kms_properties.c b/tests/kms_properties.c
index 18cf96e0..b743f9d6 100644
--- a/tests/kms_properties.c
+++ b/tests/kms_properties.c
@@ -727,8 +727,6 @@ igt_main
{
igt_display_t display;

- igt_skip_on_simulation();
-
igt_fixture {
display.drm_fd = drm_open_driver_master(DRIVER_ANY);

diff --git a/tests/kms_psr.c b/tests/kms_psr.c
index 39de0112..232c80aa 100644
--- a/tests/kms_psr.c
+++ b/tests/kms_psr.c
@@ -433,8 +433,6 @@ igt_main_args("", long_options, help_str, opt_handler, &data)
"psr2_"
};

- igt_skip_on_simulation();
-
igt_fixture {
data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
data.debugfs_fd = igt_debugfs_dir(data.drm_fd);
diff --git a/tests/kms_psr2_su.c b/tests/kms_psr2_su.c
index a9f675d1..f2244b29 100644
--- a/tests/kms_psr2_su.c
+++ b/tests/kms_psr2_su.c
@@ -232,8 +232,6 @@ igt_main
{
data_t data = {};

- igt_skip_on_simulation();
-
igt_fixture {
struct itimerspec interval;
int r;
diff --git a/tests/kms_pwrite_crc.c b/tests/kms_pwrite_crc.c
index 9bb5a5da..d6cc0c47 100644
--- a/tests/kms_pwrite_crc.c
+++ b/tests/kms_pwrite_crc.c
@@ -174,8 +174,6 @@ static data_t data;

igt_simple_main
{
- igt_skip_on_simulation();
-
data.drm_fd = drm_open_driver_master(DRIVER_INTEL);

data.devid = intel_get_drm_devid(data.drm_fd);
diff --git a/tests/kms_rmfb.c b/tests/kms_rmfb.c
index a7fcab87..81932e0d 100644
--- a/tests/kms_rmfb.c
+++ b/tests/kms_rmfb.c
@@ -157,8 +157,6 @@ igt_main
{
struct rmfb_data data = {};

- igt_skip_on_simulation();
-
igt_fixture {
data.drm_fd = drm_open_driver_master(DRIVER_ANY);

diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c
index 19852675..2a7b10e9 100644
--- a/tests/kms_rotation_crc.c
+++ b/tests/kms_rotation_crc.c
@@ -774,8 +774,6 @@ igt_main
data_t data = {};
int gen = 0;

- igt_skip_on_simulation();
-
igt_fixture {
data.gfx_fd = drm_open_driver_master(DRIVER_INTEL);
data.devid = intel_get_drm_devid(data.gfx_fd);
diff --git a/tests/kms_sequence.c b/tests/kms_sequence.c
index 6383b0ca..ff2d73cd 100644
--- a/tests/kms_sequence.c
+++ b/tests/kms_sequence.c
@@ -295,8 +295,6 @@ igt_main
{ }
}, *m;

- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver_master(DRIVER_ANY);
kmstest_set_vt_graphics_mode();
diff --git a/tests/kms_setmode.c b/tests/kms_setmode.c
index 8ace587e..802a9c3d 100644
--- a/tests/kms_setmode.c
+++ b/tests/kms_setmode.c
@@ -854,8 +854,6 @@ igt_main_args("dt:", NULL, help_str, opt_handler, NULL)
};
int i;

- igt_skip_on_simulation();
-
igt_assert_f(!(dry_run && filter_test_id),
"only one of -d and -t is accepted\n");

diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c
index 30c03bbb..676be633 100644
--- a/tests/kms_universal_plane.c
+++ b/tests/kms_universal_plane.c
@@ -790,8 +790,6 @@ igt_main
{
enum pipe pipe;

- igt_skip_on_simulation();
-
igt_fixture {
data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
data.gen = intel_gen(intel_get_drm_devid(data.drm_fd));
diff --git a/tests/kms_vblank.c b/tests/kms_vblank.c
index 79ff97b2..73694433 100644
--- a/tests/kms_vblank.c
+++ b/tests/kms_vblank.c
@@ -515,8 +515,6 @@ igt_main
int fd;
data_t data;

- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver_master(DRIVER_ANY);
kmstest_set_vt_graphics_mode();
diff --git a/tests/kms_vrr.c b/tests/kms_vrr.c
index 9801b40a..7bc4fc8a 100644
--- a/tests/kms_vrr.c
+++ b/tests/kms_vrr.c
@@ -392,8 +392,6 @@ igt_main
{
data_t data = { 0 };

- igt_skip_on_simulation();
-
igt_fixture {
data.drm_fd = drm_open_driver_master(DRIVER_ANY);

--
2.23.0