[igt-dev] [PATCH 1/3] Unblock IGT subtests validating CRC in pre-silicon

Lohith BS lohith.bs at intel.com
Thu Aug 2 07:07:11 UTC 2018


1) Earlier many IGT subtests validating CRC were blocked as
   CRC interrupt were not coming in pre-silicon.

2) A kernel patch is submitted which triggers plane processing
   by writing 1 into SWF register to generate CRC/Vblank interrupt.
   Hence unblock IGT subtests validating CRC.

3) With this patch igt_skip_on_simulation is removed for below 28 kms*
   executables.

Signed-off-by: Lohith BS <lohith.bs at intel.com>
Signed-off-by: Kumar, Mahesh1 <mahesh1.kumar at intel.com>
---
 tests/kms_atomic_interruptible.c  | 2 --
 tests/kms_atomic_transition.c     | 2 --
 tests/kms_available_modes_crc.c   | 2 --
 tests/kms_busy.c                  | 2 --
 tests/kms_chv_cursor_fail.c       | 2 --
 tests/kms_color.c                 | 2 --
 tests/kms_concurrent.c            | 2 --
 tests/kms_crtc_background_color.c | 2 --
 tests/kms_cursor_crc.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_lowres.c          | 2 --
 tests/kms_plane_multiple.c        | 2 --
 tests/kms_plane_scaling.c         | 2 --
 tests/kms_properties.c            | 2 --
 tests/kms_pwrite_crc.c            | 2 --
 tests/kms_rmfb.c                  | 2 --
 tests/kms_rotation_crc.c          | 2 --
 tests/kms_setmode.c               | 2 --
 tests/kms_universal_plane.c       | 2 --
 28 files changed, 56 deletions(-)

diff --git a/tests/kms_atomic_interruptible.c b/tests/kms_atomic_interruptible.c
index 64a0055..05e7f63 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 2fbd94b..4b9ed97 100644
--- a/tests/kms_atomic_transition.c
+++ b/tests/kms_atomic_transition.c
@@ -851,8 +851,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 b70ef5d..d2d4b07 100644
--- a/tests/kms_available_modes_crc.c
+++ b/tests/kms_available_modes_crc.c
@@ -492,8 +492,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_busy.c b/tests/kms_busy.c
index abf3982..32b3613 100644
--- a/tests/kms_busy.c
+++ b/tests/kms_busy.c
@@ -314,8 +314,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_chv_cursor_fail.c b/tests/kms_chv_cursor_fail.c
index 7138e54..121a36c 100644
--- a/tests/kms_chv_cursor_fail.c
+++ b/tests/kms_chv_cursor_fail.c
@@ -310,8 +310,6 @@ int main(int argc, char **argv)
 	igt_subtest_init_parse_opts(&argc, argv, "", long_opts, help_str,
                                     opt_handler, &data);
 
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		int ret;
 
diff --git a/tests/kms_color.c b/tests/kms_color.c
index bb106dd..6f72bac 100644
--- a/tests/kms_color.c
+++ b/tests/kms_color.c
@@ -1155,8 +1155,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 283acf8..125924f 100644
--- a/tests/kms_concurrent.c
+++ b/tests/kms_concurrent.c
@@ -402,8 +402,6 @@ int main(int argc, char *argv[])
 	igt_subtest_init_parse_opts(&argc, argv, "", long_options, help_str,
 				    opt_handler, NULL);
 
-	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_crtc_background_color.c b/tests/kms_crtc_background_color.c
index 6407e19..f32347f 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_init(&data.display, data.gfx_fd);
diff --git a/tests/kms_cursor_crc.c b/tests/kms_cursor_crc.c
index a164839..53ec2d7 100644
--- a/tests/kms_cursor_crc.c
+++ b/tests/kms_cursor_crc.c
@@ -644,8 +644,6 @@ igt_main
 	uint64_t cursor_width = 64, cursor_height = 64;
 	int ret;
 
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
 
diff --git a/tests/kms_fence_pin_leak.c b/tests/kms_fence_pin_leak.c
index 8bbd556..e410747 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);
 
 	data.devid = intel_get_drm_devid(data.drm_fd);
diff --git a/tests/kms_flip_event_leak.c b/tests/kms_flip_event_leak.c
index f1a8abd..6299b0a 100644
--- a/tests/kms_flip_event_leak.c
+++ b/tests/kms_flip_event_leak.c
@@ -98,8 +98,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 beeb111..fa0c79a 100644
--- a/tests/kms_flip_tiling.c
+++ b/tests/kms_flip_tiling.c
@@ -142,8 +142,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 e6e72f5..859e631 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 150520c..ad5df7c 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 279d0f6..4ca17e2 100644
--- a/tests/kms_mmap_write_crc.c
+++ b/tests/kms_mmap_write_crc.c
@@ -270,8 +270,6 @@ int main(int argc, char **argv)
 	int i;
 	igt_simple_init_parse_opts(&argc, argv, "n", NULL, NULL, opt_handler, NULL);
 
-	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 7df8104..5e36be7 100644
--- a/tests/kms_panel_fitting.c
+++ b/tests/kms_panel_fitting.c
@@ -238,8 +238,6 @@ igt_main
 	data_t data = {};
 
 	igt_fixture {
-		igt_skip_on_simulation();
-
 		data.drm_fd = drm_open_driver(DRIVER_ANY);
 		igt_display_init(&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 6408691..ac77c0f 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 235fdc3..5936b09 100644
--- a/tests/kms_pipe_crc_basic.c
+++ b/tests/kms_pipe_crc_basic.c
@@ -189,8 +189,6 @@ igt_main
 	igt_subtest("bad-source")
 		test_bad_source(&data);
 
-	igt_skip_on_simulation();
-
 	for (int i = 0; i < 3; i++) {
 		igt_subtest_f("read-crc-pipe-%c", 'A'+i)
 			test_read_crc(&data, i, 0);
diff --git a/tests/kms_plane.c b/tests/kms_plane.c
index f9e123f..3e2ca33 100644
--- a/tests/kms_plane.c
+++ b/tests/kms_plane.c
@@ -581,8 +581,6 @@ igt_main
 {
 	enum pipe pipe;
 
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
 
diff --git a/tests/kms_plane_lowres.c b/tests/kms_plane_lowres.c
index d1e4b3c..0f856a0 100644
--- a/tests/kms_plane_lowres.c
+++ b/tests/kms_plane_lowres.c
@@ -295,8 +295,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_multiple.c b/tests/kms_plane_multiple.c
index e61bc84..4a18e72 100644
--- a/tests/kms_plane_multiple.c
+++ b/tests/kms_plane_multiple.c
@@ -388,8 +388,6 @@ int main(int argc, char *argv[])
 	igt_subtest_init_parse_opts(&argc, argv, "", long_options, help_str,
 				    opt_handler, NULL);
 
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
 		kmstest_set_vt_graphics_mode();
diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c
index 2f19a42..b387b3e 100644
--- a/tests/kms_plane_scaling.c
+++ b/tests/kms_plane_scaling.c
@@ -538,8 +538,6 @@ igt_main
 	data_t data = {};
 	enum pipe pipe;
 
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
 		igt_require_pipe_crc(data.drm_fd);
diff --git a/tests/kms_properties.c b/tests/kms_properties.c
index 68c0518..ad7561b 100644
--- a/tests/kms_properties.c
+++ b/tests/kms_properties.c
@@ -671,8 +671,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_pwrite_crc.c b/tests/kms_pwrite_crc.c
index ee895db..0149f2e 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();
-
 	igt_fixture {
 		data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
 
diff --git a/tests/kms_rmfb.c b/tests/kms_rmfb.c
index f3461cc..5a0b65e 100644
--- a/tests/kms_rmfb.c
+++ b/tests/kms_rmfb.c
@@ -139,8 +139,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 6cb5858..04336e5 100644
--- a/tests/kms_rotation_crc.c
+++ b/tests/kms_rotation_crc.c
@@ -523,8 +523,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_setmode.c b/tests/kms_setmode.c
index 47d04fb..83bb67a 100644
--- a/tests/kms_setmode.c
+++ b/tests/kms_setmode.c
@@ -847,8 +847,6 @@ int main(int argc, char **argv)
 	if (ret < 0)
 		return ret == -1 ? 0 : ret;
 
-	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 58f329e..6b45d92 100644
--- a/tests/kms_universal_plane.c
+++ b/tests/kms_universal_plane.c
@@ -789,8 +789,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));
-- 
1.9.1



More information about the igt-dev mailing list