* [igt-dev] [PATCH i-g-t v2 0/7] removal of igt_skip_on_simulation() from i915/ tests
@ 2019-12-02 6:01 Swati Sharma
2019-12-02 6:01 ` [igt-dev] [PATCH i-g-t v2 1/7] tests/i915/gem: remove igt_skip_on_simulation() Swati Sharma
` (7 more replies)
0 siblings, 8 replies; 10+ messages in thread
From: Swati Sharma @ 2019-12-02 6:01 UTC (permalink / raw)
To: igt-dev; +Cc: lucas.demarchi, martin.peres, maarten.lankhorst
Removing igt_skip_on_simulation() since this feature is not supported
anymore by i915 driver. Removing it from gem, kms, i915 specific, tools
and benchmark tests.
Swati Sharma (7):
tests/i915/gem: remove igt_skip_on_simulation()
tests/i915/kms: remove igt_skip_on_simulation()
tests/i915: remove igt_skip_on_simulation()
tests: remove igt_skip_on_simulation()
tools: remove igt_skip_on_simulation()
benchmarks: remove igt_skip_on_simulation()
lib: remove igt_skip_on_simulation
benchmarks/gem_userptr_benchmark.c | 2 --
lib/igt_aux.c | 7 -------
lib/intel_os.c | 2 --
tests/debugfs_test.c | 2 --
tests/i915/gem_busy.c | 2 --
tests/i915/gem_caching.c | 2 --
tests/i915/gem_concurrent_all.c | 2 --
tests/i915/gem_create.c | 2 --
tests/i915/gem_cs_prefetch.c | 2 --
tests/i915/gem_cs_tlb.c | 2 --
tests/i915/gem_ctx_exec.c | 2 --
tests/i915/gem_ctx_switch.c | 6 ------
tests/i915/gem_ctx_thrash.c | 2 --
tests/i915/gem_double_irq_loop.c | 2 --
tests/i915/gem_eio.c | 2 --
tests/i915/gem_exec_async.c | 2 --
tests/i915/gem_exec_balancer.c | 2 --
tests/i915/gem_exec_blt.c | 2 --
tests/i915/gem_exec_capture.c | 2 --
tests/i915/gem_exec_fence.c | 2 --
tests/i915/gem_exec_gttfill.c | 2 --
tests/i915/gem_exec_lut_handle.c | 2 --
tests/i915/gem_exec_schedule.c | 2 --
tests/i915/gem_exec_suspend.c | 2 --
tests/i915/gem_fence_thrash.c | 2 --
tests/i915/gem_fence_upload.c | 2 --
tests/i915/gem_fenced_exec_thrash.c | 2 --
tests/i915/gem_flink_race.c | 2 --
tests/i915/gem_gtt_cpu_tlb.c | 2 --
tests/i915/gem_gtt_hog.c | 2 --
tests/i915/gem_gtt_speed.c | 2 --
tests/i915/gem_largeobject.c | 2 --
tests/i915/gem_madvise.c | 2 --
tests/i915/gem_mmap_offset_exhaustion.c | 2 --
tests/i915/gem_partial_pwrite_pread.c | 2 --
tests/i915/gem_persistent_relocs.c | 2 --
tests/i915/gem_pread_after_blit.c | 2 --
tests/i915/gem_pwrite_pread.c | 2 --
tests/i915/gem_pwrite_snooped.c | 2 --
tests/i915/gem_read_read_speed.c | 2 --
tests/i915/gem_readwrite.c | 2 --
tests/i915/gem_reloc_vs_gpu.c | 2 --
tests/i915/gem_render_linear_blits.c | 3 ---
tests/i915/gem_render_tiled_blits.c | 3 ---
tests/i915/gem_reset_stats.c | 1 -
tests/i915/gem_ringfill.c | 2 --
tests/i915/gem_set_tiling_vs_blt.c | 2 --
tests/i915/gem_set_tiling_vs_gtt.c | 2 --
tests/i915/gem_set_tiling_vs_pwrite.c | 2 --
tests/i915/gem_shrink.c | 2 --
tests/i915/gem_softpin.c | 2 --
tests/i915/gem_spin_batch.c | 2 --
tests/i915/gem_stolen.c | 2 --
tests/i915/gem_storedw_batches_loop.c | 2 --
tests/i915/gem_sync.c | 2 --
tests/i915/gem_threaded_access_tiled.c | 2 --
tests/i915/gem_tiled_fence_blits.c | 3 ---
tests/i915/gem_tiled_partial_pwrite_pread.c | 2 --
tests/i915/gem_unfence_active_buffers.c | 2 --
tests/i915/gem_unref_active_buffers.c | 2 --
tests/i915/gem_wait.c | 2 --
tests/i915/gem_write_read_ring_switch.c | 2 --
tests/i915/i915_hangman.c | 2 --
tests/i915/i915_pm_backlight.c | 2 --
tests/i915/i915_pm_dc.c | 1 -
tests/i915/i915_pm_rc6_residency.c | 2 --
tests/i915/i915_pm_rps.c | 2 --
tests/i915/i915_pm_sseu.c | 3 ---
tests/i915/i915_suspend.c | 2 --
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 --
tests/perf.c | 2 --
tests/prime_busy.c | 1 -
tests/prime_mmap_kms.c | 2 --
tests/prime_udl.c | 2 --
tests/testdisplay.c | 1 -
tests/tools_test.c | 2 --
tools/intel_dp_compliance.c | 2 --
113 files changed, 235 deletions(-)
--
2.23.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 10+ messages in thread
* [igt-dev] [PATCH i-g-t v2 1/7] tests/i915/gem: remove igt_skip_on_simulation()
2019-12-02 6:01 [igt-dev] [PATCH i-g-t v2 0/7] removal of igt_skip_on_simulation() from i915/ tests Swati Sharma
@ 2019-12-02 6:01 ` Swati Sharma
2019-12-02 6:01 ` [igt-dev] [PATCH i-g-t v2 2/7] tests/i915/kms: " Swati Sharma
` (6 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Swati Sharma @ 2019-12-02 6:01 UTC (permalink / raw)
To: igt-dev; +Cc: lucas.demarchi, martin.peres, maarten.lankhorst
Removing igt_skip_on_simulation() from all the gem tests
since this feature is not supported anymore.
v2: Rebase
Signed-off-by: Swati Sharma <swati2.sharma@intel.com>
Signed-off-by: Karthik B S <karthik.b.s@intel.com>
Reviewed-by: Martin Peres <martin.peres@linux.intel.com>
---
tests/i915/gem_busy.c | 2 --
tests/i915/gem_caching.c | 2 --
tests/i915/gem_concurrent_all.c | 2 --
tests/i915/gem_create.c | 2 --
tests/i915/gem_cs_prefetch.c | 2 --
tests/i915/gem_cs_tlb.c | 2 --
tests/i915/gem_ctx_exec.c | 2 --
tests/i915/gem_ctx_switch.c | 6 ------
tests/i915/gem_ctx_thrash.c | 2 --
tests/i915/gem_double_irq_loop.c | 2 --
tests/i915/gem_eio.c | 2 --
tests/i915/gem_exec_async.c | 2 --
tests/i915/gem_exec_balancer.c | 2 --
tests/i915/gem_exec_blt.c | 2 --
tests/i915/gem_exec_capture.c | 2 --
tests/i915/gem_exec_fence.c | 2 --
tests/i915/gem_exec_gttfill.c | 2 --
tests/i915/gem_exec_lut_handle.c | 2 --
tests/i915/gem_exec_schedule.c | 2 --
tests/i915/gem_exec_suspend.c | 2 --
tests/i915/gem_fence_thrash.c | 2 --
tests/i915/gem_fence_upload.c | 2 --
tests/i915/gem_fenced_exec_thrash.c | 2 --
tests/i915/gem_flink_race.c | 2 --
tests/i915/gem_gtt_cpu_tlb.c | 2 --
tests/i915/gem_gtt_hog.c | 2 --
tests/i915/gem_gtt_speed.c | 2 --
tests/i915/gem_largeobject.c | 2 --
tests/i915/gem_madvise.c | 2 --
tests/i915/gem_mmap_offset_exhaustion.c | 2 --
tests/i915/gem_partial_pwrite_pread.c | 2 --
tests/i915/gem_persistent_relocs.c | 2 --
tests/i915/gem_pread_after_blit.c | 2 --
tests/i915/gem_pwrite_pread.c | 2 --
tests/i915/gem_pwrite_snooped.c | 2 --
tests/i915/gem_read_read_speed.c | 2 --
tests/i915/gem_readwrite.c | 2 --
tests/i915/gem_reloc_vs_gpu.c | 2 --
tests/i915/gem_render_linear_blits.c | 3 ---
tests/i915/gem_render_tiled_blits.c | 3 ---
tests/i915/gem_reset_stats.c | 1 -
tests/i915/gem_ringfill.c | 2 --
tests/i915/gem_set_tiling_vs_blt.c | 2 --
tests/i915/gem_set_tiling_vs_gtt.c | 2 --
tests/i915/gem_set_tiling_vs_pwrite.c | 2 --
tests/i915/gem_shrink.c | 2 --
tests/i915/gem_softpin.c | 2 --
tests/i915/gem_spin_batch.c | 2 --
tests/i915/gem_stolen.c | 2 --
tests/i915/gem_storedw_batches_loop.c | 2 --
tests/i915/gem_sync.c | 2 --
tests/i915/gem_threaded_access_tiled.c | 2 --
tests/i915/gem_tiled_fence_blits.c | 3 ---
tests/i915/gem_tiled_partial_pwrite_pread.c | 2 --
tests/i915/gem_unfence_active_buffers.c | 2 --
tests/i915/gem_unref_active_buffers.c | 2 --
tests/i915/gem_wait.c | 2 --
tests/i915/gem_write_read_ring_switch.c | 2 --
58 files changed, 122 deletions(-)
diff --git a/tests/i915/gem_busy.c b/tests/i915/gem_busy.c
index b84e2bd1..39a6714c 100644
--- a/tests/i915/gem_busy.c
+++ b/tests/i915/gem_busy.c
@@ -562,7 +562,6 @@ igt_main
igt_subtest_f("%shang-%s",
e->class == I915_ENGINE_CLASS_RENDER
? "basic-" : "", e->name) {
- igt_skip_on_simulation();
gem_quiescent_gpu(fd);
basic(fd, e, HANG);
}
@@ -576,7 +575,6 @@ igt_main
__for_each_physical_engine(fd, e) {
igt_subtest_f("extended-hang-%s", e->name) {
- igt_skip_on_simulation();
igt_require(gem_class_can_store_dword(fd, e->class));
gem_quiescent_gpu(fd);
diff --git a/tests/i915/gem_caching.c b/tests/i915/gem_caching.c
index ce9e6345..7c1f6410 100644
--- a/tests/i915/gem_caching.c
+++ b/tests/i915/gem_caching.c
@@ -106,8 +106,6 @@ igt_main
uint8_t *cpu_ptr;
uint8_t *gtt_ptr;
- igt_skip_on_simulation();
-
igt_fixture {
srandom(0xdeadbeef);
diff --git a/tests/i915/gem_concurrent_all.c b/tests/i915/gem_concurrent_all.c
index 992bea62..6486bebf 100644
--- a/tests/i915/gem_concurrent_all.c
+++ b/tests/i915/gem_concurrent_all.c
@@ -1777,8 +1777,6 @@ igt_main
char name[80];
int count = 0;
- igt_skip_on_simulation();
-
if (strstr(igt_test_name(), "all"))
all = true;
diff --git a/tests/i915/gem_create.c b/tests/i915/gem_create.c
index ea148200..8fc128da 100644
--- a/tests/i915/gem_create.c
+++ b/tests/i915/gem_create.c
@@ -294,8 +294,6 @@ igt_main
{
int fd = -1;
- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
}
diff --git a/tests/i915/gem_cs_prefetch.c b/tests/i915/gem_cs_prefetch.c
index 17190857..3498aa1e 100644
--- a/tests/i915/gem_cs_prefetch.c
+++ b/tests/i915/gem_cs_prefetch.c
@@ -141,8 +141,6 @@ igt_main
{
const struct intel_execution_engine *e;
- igt_skip_on_simulation();
-
for (e = intel_execution_engines; e->name; e++)
igt_subtest_f("%s", e->name)
test_ring(eb_ring(e));
diff --git a/tests/i915/gem_cs_tlb.c b/tests/i915/gem_cs_tlb.c
index 13de5499..0c1e0949 100644
--- a/tests/i915/gem_cs_tlb.c
+++ b/tests/i915/gem_cs_tlb.c
@@ -143,8 +143,6 @@ igt_main
const struct intel_execution_engine2 *e;
int fd = -1;
- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_ctx_exec.c b/tests/i915/gem_ctx_exec.c
index 817552e2..b1ae6577 100644
--- a/tests/i915/gem_ctx_exec.c
+++ b/tests/i915/gem_ctx_exec.c
@@ -290,8 +290,6 @@ igt_main
igt_subtest("reset-pin-leak") {
int i;
- igt_skip_on_simulation();
-
/*
* Use an explicit context to isolate the test from
* any major code changes related to the per-file
diff --git a/tests/i915/gem_ctx_switch.c b/tests/i915/gem_ctx_switch.c
index 36ecd537..6bbd2497 100644
--- a/tests/i915/gem_ctx_switch.c
+++ b/tests/i915/gem_ctx_switch.c
@@ -365,9 +365,6 @@ igt_main
igt_subtest_f("legacy-%s%s", e->name, p->name)
single(fd, light, e2, p->flags, 1, 5);
-
- igt_skip_on_simulation();
-
igt_subtest_f("legacy-%s-heavy%s",
e->name, p->name)
single(fd, heavy, e2, p->flags, 1, 5);
@@ -394,9 +391,6 @@ igt_main
igt_subtest_f("%s%s", e2->name, p->name)
single(fd, light, e2, p->flags, 1, 5);
-
- igt_skip_on_simulation();
-
igt_subtest_f("%s-heavy%s", e2->name, p->name)
single(fd, heavy, e2, p->flags, 1, 5);
igt_subtest_f("%s-forked%s", e2->name, p->name)
diff --git a/tests/i915/gem_ctx_thrash.c b/tests/i915/gem_ctx_thrash.c
index 62c26e9a..ae38a7ab 100644
--- a/tests/i915/gem_ctx_thrash.c
+++ b/tests/i915/gem_ctx_thrash.c
@@ -359,8 +359,6 @@ static void threads(void)
igt_main
{
- igt_skip_on_simulation();
-
igt_subtest("single")
single("single", false);
igt_subtest("engines")
diff --git a/tests/i915/gem_double_irq_loop.c b/tests/i915/gem_double_irq_loop.c
index f17f61c1..1987d01d 100644
--- a/tests/i915/gem_double_irq_loop.c
+++ b/tests/i915/gem_double_irq_loop.c
@@ -91,8 +91,6 @@ igt_simple_main
int fd;
int devid;
- igt_skip_on_simulation();
-
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
gem_require_blitter(fd);
diff --git a/tests/i915/gem_eio.c b/tests/i915/gem_eio.c
index 49d2a99e..b9e331ac 100644
--- a/tests/i915/gem_eio.c
+++ b/tests/i915/gem_eio.c
@@ -907,8 +907,6 @@ exit_handler(int sig)
igt_main
{
- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
igt_device_drop_master(fd);
diff --git a/tests/i915/gem_exec_async.c b/tests/i915/gem_exec_async.c
index b9859ffa..62349396 100644
--- a/tests/i915/gem_exec_async.c
+++ b/tests/i915/gem_exec_async.c
@@ -190,8 +190,6 @@ igt_main
const struct intel_execution_engine *e;
int fd = -1;
- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver_master(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_exec_balancer.c b/tests/i915/gem_exec_balancer.c
index 86028cfd..7a51b73c 100644
--- a/tests/i915/gem_exec_balancer.c
+++ b/tests/i915/gem_exec_balancer.c
@@ -1518,8 +1518,6 @@ igt_main
{
int i915 = -1;
- igt_skip_on_simulation();
-
igt_fixture {
i915 = drm_open_driver(DRIVER_INTEL);
igt_require_gem(i915);
diff --git a/tests/i915/gem_exec_blt.c b/tests/i915/gem_exec_blt.c
index ffb60d0c..fb2f3693 100644
--- a/tests/i915/gem_exec_blt.c
+++ b/tests/i915/gem_exec_blt.c
@@ -307,8 +307,6 @@ igt_main
int min = -1, max = -1;
int fd, sysfs;
- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_exec_capture.c b/tests/i915/gem_exec_capture.c
index 54da57ac..fe2c4bd1 100644
--- a/tests/i915/gem_exec_capture.c
+++ b/tests/i915/gem_exec_capture.c
@@ -531,8 +531,6 @@ igt_main
int fd = -1;
int dir = -1;
- igt_skip_on_simulation();
-
igt_fixture {
int gen;
diff --git a/tests/i915/gem_exec_fence.c b/tests/i915/gem_exec_fence.c
index a9e29889..0fc7301a 100644
--- a/tests/i915/gem_exec_fence.c
+++ b/tests/i915/gem_exec_fence.c
@@ -1450,8 +1450,6 @@ igt_main
igt_subtest_group {
igt_hang_t hang;
- igt_skip_on_simulation();
-
igt_fixture {
hang = igt_allow_hang(i915, 0, 0);
}
diff --git a/tests/i915/gem_exec_gttfill.c b/tests/i915/gem_exec_gttfill.c
index fa9161b4..f810dafd 100644
--- a/tests/i915/gem_exec_gttfill.c
+++ b/tests/i915/gem_exec_gttfill.c
@@ -209,8 +209,6 @@ igt_main
const struct intel_execution_engine *e;
int device = -1;
- igt_skip_on_simulation();
-
igt_fixture {
device = drm_open_driver(DRIVER_INTEL);
igt_require_gem(device);
diff --git a/tests/i915/gem_exec_lut_handle.c b/tests/i915/gem_exec_lut_handle.c
index 98e6ae5a..b7b69157 100644
--- a/tests/i915/gem_exec_lut_handle.c
+++ b/tests/i915/gem_exec_lut_handle.c
@@ -101,8 +101,6 @@ igt_simple_main
uint32_t reloc_handle;
int size;
- igt_skip_on_simulation();
-
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_exec_schedule.c b/tests/i915/gem_exec_schedule.c
index dc1c3a92..a41e2911 100644
--- a/tests/i915/gem_exec_schedule.c
+++ b/tests/i915/gem_exec_schedule.c
@@ -1675,8 +1675,6 @@ igt_main
const struct intel_execution_engine *e;
int fd = -1;
- igt_skip_on_simulation();
-
igt_fixture {
igt_require_sw_sync();
diff --git a/tests/i915/gem_exec_suspend.c b/tests/i915/gem_exec_suspend.c
index eb28669c..f0c53daf 100644
--- a/tests/i915/gem_exec_suspend.c
+++ b/tests/i915/gem_exec_suspend.c
@@ -306,8 +306,6 @@ igt_main
igt_hang_t hang;
int fd;
- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver_master(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_fence_thrash.c b/tests/i915/gem_fence_thrash.c
index 2d7fb2ff..c85c38bb 100644
--- a/tests/i915/gem_fence_thrash.c
+++ b/tests/i915/gem_fence_thrash.c
@@ -234,8 +234,6 @@ static int run_test(int threads_per_fence, void *f, int tiling,
igt_main
{
- igt_skip_on_simulation();
-
igt_subtest("bo-write-verify-none")
igt_assert(run_test(0, bo_write_verify, I915_TILING_NONE, 80) == 0);
diff --git a/tests/i915/gem_fence_upload.c b/tests/i915/gem_fence_upload.c
index f3b0e62f..17580aff 100644
--- a/tests/i915/gem_fence_upload.c
+++ b/tests/i915/gem_fence_upload.c
@@ -388,8 +388,6 @@ static void wc_contention(void)
igt_main
{
- igt_skip_on_simulation();
-
igt_subtest("performance")
performance();
igt_subtest("thread-contention")
diff --git a/tests/i915/gem_fenced_exec_thrash.c b/tests/i915/gem_fenced_exec_thrash.c
index 145b8bf8..e40fa438 100644
--- a/tests/i915/gem_fenced_exec_thrash.c
+++ b/tests/i915/gem_fenced_exec_thrash.c
@@ -160,8 +160,6 @@ igt_main
unsigned int num_fences = 0;
int fd = -1;
- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_flink_race.c b/tests/i915/gem_flink_race.c
index 322befe9..c1f5d5d5 100644
--- a/tests/i915/gem_flink_race.c
+++ b/tests/i915/gem_flink_race.c
@@ -197,8 +197,6 @@ static void test_flink_close(void)
igt_main
{
- igt_skip_on_simulation();
-
igt_subtest("flink_name")
test_flink_name(5);
diff --git a/tests/i915/gem_gtt_cpu_tlb.c b/tests/i915/gem_gtt_cpu_tlb.c
index 7a4a925f..0af6a1c4 100644
--- a/tests/i915/gem_gtt_cpu_tlb.c
+++ b/tests/i915/gem_gtt_cpu_tlb.c
@@ -76,8 +76,6 @@ igt_simple_main
uint32_t *ptr;
- igt_skip_on_simulation();
-
fd = drm_open_driver(DRIVER_INTEL);
gem_require_mappable_ggtt(fd);
diff --git a/tests/i915/gem_gtt_hog.c b/tests/i915/gem_gtt_hog.c
index 06d140d2..1ebef776 100644
--- a/tests/i915/gem_gtt_hog.c
+++ b/tests/i915/gem_gtt_hog.c
@@ -164,8 +164,6 @@ igt_simple_main
gem_require_mappable_ggtt(fd);
close(fd);
- igt_skip_on_simulation();
-
data.fd = drm_open_driver(DRIVER_INTEL);
data.devid = intel_get_drm_devid(data.fd);
data.intel_gen = intel_gen(data.devid);
diff --git a/tests/i915/gem_gtt_speed.c b/tests/i915/gem_gtt_speed.c
index 18078238..f0c1954f 100644
--- a/tests/i915/gem_gtt_speed.c
+++ b/tests/i915/gem_gtt_speed.c
@@ -112,8 +112,6 @@ igt_simple_main_args("s:", NULL, help_str, opt_handler, NULL)
int loop, i, tiling;
int fd;
- igt_skip_on_simulation();
-
igt_assert_f(size != 0, "Invalid object size specified\n");
if (cpu) {
diff --git a/tests/i915/gem_largeobject.c b/tests/i915/gem_largeobject.c
index 518396fa..fc9296cd 100644
--- a/tests/i915/gem_largeobject.c
+++ b/tests/i915/gem_largeobject.c
@@ -77,8 +77,6 @@ igt_simple_main
{
int fd;
- igt_skip_on_simulation();
-
data = malloc(OBJ_SIZE);
igt_assert(data);
diff --git a/tests/i915/gem_madvise.c b/tests/i915/gem_madvise.c
index 729a4d33..7162a5c3 100644
--- a/tests/i915/gem_madvise.c
+++ b/tests/i915/gem_madvise.c
@@ -149,8 +149,6 @@ dontneed_before_exec(void)
igt_main
{
- igt_skip_on_simulation();
-
igt_subtest("dontneed-before-mmap")
dontneed_before_mmap();
diff --git a/tests/i915/gem_mmap_offset_exhaustion.c b/tests/i915/gem_mmap_offset_exhaustion.c
index 8c8e3fa2..f243507e 100644
--- a/tests/i915/gem_mmap_offset_exhaustion.c
+++ b/tests/i915/gem_mmap_offset_exhaustion.c
@@ -78,8 +78,6 @@ igt_simple_main
{
int fd, i;
- igt_skip_on_simulation();
-
fd = drm_open_driver(DRIVER_INTEL);
/* we have 32bit of address space, so try to fit one MB more
diff --git a/tests/i915/gem_partial_pwrite_pread.c b/tests/i915/gem_partial_pwrite_pread.c
index 49e086ed..afd43694 100644
--- a/tests/i915/gem_partial_pwrite_pread.c
+++ b/tests/i915/gem_partial_pwrite_pread.c
@@ -248,8 +248,6 @@ igt_main
{
srandom(0xdeadbeef);
- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_persistent_relocs.c b/tests/i915/gem_persistent_relocs.c
index 20ee0302..7c831aaa 100644
--- a/tests/i915/gem_persistent_relocs.c
+++ b/tests/i915/gem_persistent_relocs.c
@@ -322,8 +322,6 @@ int fd;
#define MAX_BLT_SIZE 128
igt_main
{
- igt_skip_on_simulation();
-
memset(blob, 'A', sizeof(blob));
igt_fixture {
diff --git a/tests/i915/gem_pread_after_blit.c b/tests/i915/gem_pread_after_blit.c
index cee92127..e12b5d65 100644
--- a/tests/i915/gem_pread_after_blit.c
+++ b/tests/i915/gem_pread_after_blit.c
@@ -208,8 +208,6 @@ igt_main
{ NULL, -1 },
}, *t;
- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_pwrite_pread.c b/tests/i915/gem_pwrite_pread.c
index 422db34d..9287c677 100644
--- a/tests/i915/gem_pwrite_pread.c
+++ b/tests/i915/gem_pwrite_pread.c
@@ -274,8 +274,6 @@ igt_main_args("s:", NULL, help_str, opt_handler, NULL)
uint32_t buf[20];
int count;
- igt_skip_on_simulation();
-
if (object_size == 0)
object_size = OBJECT_SIZE;
object_size = (object_size + 3) & -4;
diff --git a/tests/i915/gem_pwrite_snooped.c b/tests/i915/gem_pwrite_snooped.c
index 80f590de..14f4c44a 100644
--- a/tests/i915/gem_pwrite_snooped.c
+++ b/tests/i915/gem_pwrite_snooped.c
@@ -127,8 +127,6 @@ static void test(int w, int h)
igt_simple_main
{
- igt_skip_on_simulation();
-
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
gem_require_blitter(fd);
diff --git a/tests/i915/gem_read_read_speed.c b/tests/i915/gem_read_read_speed.c
index 5f1356eb..8b5ba8f7 100644
--- a/tests/i915/gem_read_read_speed.c
+++ b/tests/i915/gem_read_read_speed.c
@@ -180,8 +180,6 @@ igt_main
drm_intel_bufmgr *bufmgr = NULL;
int fd, i;
- igt_skip_on_simulation();
-
igt_fixture {
int devid;
diff --git a/tests/i915/gem_readwrite.c b/tests/i915/gem_readwrite.c
index fdf279f1..6b2977c1 100644
--- a/tests/i915/gem_readwrite.c
+++ b/tests/i915/gem_readwrite.c
@@ -81,8 +81,6 @@ igt_main
uint8_t buf[OBJECT_SIZE];
int ret;
- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
diff --git a/tests/i915/gem_reloc_vs_gpu.c b/tests/i915/gem_reloc_vs_gpu.c
index 46f14517..ebc71a68 100644
--- a/tests/i915/gem_reloc_vs_gpu.c
+++ b/tests/i915/gem_reloc_vs_gpu.c
@@ -297,8 +297,6 @@ int fd;
#define MAX_BLT_SIZE 128
igt_main
{
- igt_skip_on_simulation();
-
memset(blob, 'A', sizeof(blob));
igt_fixture {
diff --git a/tests/i915/gem_render_linear_blits.c b/tests/i915/gem_render_linear_blits.c
index 667ee872..a726652b 100644
--- a/tests/i915/gem_render_linear_blits.c
+++ b/tests/i915/gem_render_linear_blits.c
@@ -199,9 +199,6 @@ igt_main
run_test(fd, 2);
}
- /* the rest of the tests are too long for simulation */
- igt_skip_on_simulation();
-
igt_subtest("aperture-thrash") {
count = 3 * gem_aperture_size(fd) / SIZE / 2;
intel_require_memory(count, SIZE, CHECK_RAM);
diff --git a/tests/i915/gem_render_tiled_blits.c b/tests/i915/gem_render_tiled_blits.c
index 12950061..14018329 100644
--- a/tests/i915/gem_render_tiled_blits.c
+++ b/tests/i915/gem_render_tiled_blits.c
@@ -210,9 +210,6 @@ igt_main
run_test(fd, 2);
}
- /* the rest of the tests are too long for simulation */
- igt_skip_on_simulation();
-
igt_subtest("aperture-thrash") {
count = 3 * gem_aperture_size(fd) / SIZE / 2;
intel_require_memory(count, SIZE, CHECK_RAM);
diff --git a/tests/i915/gem_reset_stats.c b/tests/i915/gem_reset_stats.c
index 0931641a..9c7b6645 100644
--- a/tests/i915/gem_reset_stats.c
+++ b/tests/i915/gem_reset_stats.c
@@ -773,7 +773,6 @@ static bool gem_has_reset_stats(int fd)
igt_main
{
const struct intel_execution_engine *e;
- igt_skip_on_simulation();
igt_fixture {
int fd;
diff --git a/tests/i915/gem_ringfill.c b/tests/i915/gem_ringfill.c
index af66d001..4c73f4d9 100644
--- a/tests/i915/gem_ringfill.c
+++ b/tests/i915/gem_ringfill.c
@@ -286,8 +286,6 @@ igt_main
e->name,
m->suffix) {
igt_skip_on(m->flags & NEWFD && master);
- if (m->flags & (HANG|SUSPEND|HIBERNATE))
- igt_skip_on_simulation();
run_test(fd, eb_ring(e), m->flags, m->timeout);
}
}
diff --git a/tests/i915/gem_set_tiling_vs_blt.c b/tests/i915/gem_set_tiling_vs_blt.c
index 01230547..c317d1ef 100644
--- a/tests/i915/gem_set_tiling_vs_blt.c
+++ b/tests/i915/gem_set_tiling_vs_blt.c
@@ -225,8 +225,6 @@ igt_main
int i;
uint32_t tiling, tiling_after;
- igt_skip_on_simulation();
-
igt_fixture {
for (i = 0; i < 1024*256; i++)
data[i] = i;
diff --git a/tests/i915/gem_set_tiling_vs_gtt.c b/tests/i915/gem_set_tiling_vs_gtt.c
index 2611ec55..618c2d05 100644
--- a/tests/i915/gem_set_tiling_vs_gtt.c
+++ b/tests/i915/gem_set_tiling_vs_gtt.c
@@ -56,8 +56,6 @@ igt_simple_main
bool tiling_changed;
int tile_height;
- igt_skip_on_simulation();
-
fd = drm_open_driver(DRIVER_INTEL);
if (IS_GEN2(intel_get_drm_devid(fd)))
diff --git a/tests/i915/gem_set_tiling_vs_pwrite.c b/tests/i915/gem_set_tiling_vs_pwrite.c
index f0126b64..25a28191 100644
--- a/tests/i915/gem_set_tiling_vs_pwrite.c
+++ b/tests/i915/gem_set_tiling_vs_pwrite.c
@@ -54,8 +54,6 @@ igt_simple_main
int i;
uint32_t handle;
- igt_skip_on_simulation();
-
fd = drm_open_driver(DRIVER_INTEL);
for (i = 0; i < OBJECT_SIZE/4; i++)
diff --git a/tests/i915/gem_shrink.c b/tests/i915/gem_shrink.c
index d2ea2ed8..11aa9efc 100644
--- a/tests/i915/gem_shrink.c
+++ b/tests/i915/gem_shrink.c
@@ -424,8 +424,6 @@ igt_main
uint64_t alloc_size = 0;
int num_processes = 0;
- igt_skip_on_simulation();
-
igt_fixture {
uint64_t mem_size = intel_get_total_ram_mb();
int fd;
diff --git a/tests/i915/gem_softpin.c b/tests/i915/gem_softpin.c
index b9ff532e..e22631ab 100644
--- a/tests/i915/gem_softpin.c
+++ b/tests/i915/gem_softpin.c
@@ -480,8 +480,6 @@ igt_main
{
int fd = -1;
- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver_master(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_spin_batch.c b/tests/i915/gem_spin_batch.c
index c67f015f..c5114ac7 100644
--- a/tests/i915/gem_spin_batch.c
+++ b/tests/i915/gem_spin_batch.c
@@ -175,8 +175,6 @@ igt_main
struct intel_execution_engine2 e2__;
int fd = -1;
- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_stolen.c b/tests/i915/gem_stolen.c
index e2c52723..d6b30dcb 100644
--- a/tests/i915/gem_stolen.c
+++ b/tests/i915/gem_stolen.c
@@ -404,8 +404,6 @@ igt_main
int fd;
uint32_t devid;
- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
devid = intel_get_drm_devid(fd);
diff --git a/tests/i915/gem_storedw_batches_loop.c b/tests/i915/gem_storedw_batches_loop.c
index c0343ccb..65aba88a 100644
--- a/tests/i915/gem_storedw_batches_loop.c
+++ b/tests/i915/gem_storedw_batches_loop.c
@@ -130,8 +130,6 @@ int devid;
igt_main
{
- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_sync.c b/tests/i915/gem_sync.c
index 9ffca415..0010ac10 100644
--- a/tests/i915/gem_sync.c
+++ b/tests/i915/gem_sync.c
@@ -1213,8 +1213,6 @@ igt_main
const int ncpus = sysconf(_SC_NPROCESSORS_ONLN);
int fd = -1;
- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_threaded_access_tiled.c b/tests/i915/gem_threaded_access_tiled.c
index 288324d4..64a00026 100644
--- a/tests/i915/gem_threaded_access_tiled.c
+++ b/tests/i915/gem_threaded_access_tiled.c
@@ -95,8 +95,6 @@ igt_simple_main
unsigned long pitch = 0;
int r;
- igt_skip_on_simulation();
-
fd = drm_open_driver(DRIVER_INTEL);
igt_assert(fd >= 0);
diff --git a/tests/i915/gem_tiled_fence_blits.c b/tests/i915/gem_tiled_fence_blits.c
index ef03c73b..93c79dc2 100644
--- a/tests/i915/gem_tiled_fence_blits.c
+++ b/tests/i915/gem_tiled_fence_blits.c
@@ -219,9 +219,6 @@ igt_main
igt_subtest("basic")
run_test (fd, 2);
- /* the rest of the tests are too long for simulation */
- igt_skip_on_simulation();
-
igt_subtest("normal") {
uint64_t count;
diff --git a/tests/i915/gem_tiled_partial_pwrite_pread.c b/tests/i915/gem_tiled_partial_pwrite_pread.c
index 3d160b0f..9d15cdf1 100644
--- a/tests/i915/gem_tiled_partial_pwrite_pread.c
+++ b/tests/i915/gem_tiled_partial_pwrite_pread.c
@@ -262,8 +262,6 @@ igt_main
{
uint32_t tiling_mode = I915_TILING_X;
- igt_skip_on_simulation();
-
srandom(0xdeadbeef);
igt_fixture {
diff --git a/tests/i915/gem_unfence_active_buffers.c b/tests/i915/gem_unfence_active_buffers.c
index a357ec32..c1670dd5 100644
--- a/tests/i915/gem_unfence_active_buffers.c
+++ b/tests/i915/gem_unfence_active_buffers.c
@@ -68,8 +68,6 @@ igt_simple_main
drm_intel_bo *busy_bo, *test_bo;
uint32_t tiling = I915_TILING_X;
- igt_skip_on_simulation();
-
for (i = 0; i < 1024*256; i++)
data[i] = i;
diff --git a/tests/i915/gem_unref_active_buffers.c b/tests/i915/gem_unref_active_buffers.c
index b5d48206..2adf0f1a 100644
--- a/tests/i915/gem_unref_active_buffers.c
+++ b/tests/i915/gem_unref_active_buffers.c
@@ -54,8 +54,6 @@ igt_simple_main
{
int fd, i;
- igt_skip_on_simulation();
-
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
gem_require_blitter(fd);
diff --git a/tests/i915/gem_wait.c b/tests/i915/gem_wait.c
index b5e32219..71f8bb5a 100644
--- a/tests/i915/gem_wait.c
+++ b/tests/i915/gem_wait.c
@@ -137,8 +137,6 @@ igt_main
const struct intel_execution_engine2 *e;
int fd = -1;
- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver_master(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_write_read_ring_switch.c b/tests/i915/gem_write_read_ring_switch.c
index 095c13c3..55bfbeaf 100644
--- a/tests/i915/gem_write_read_ring_switch.c
+++ b/tests/i915/gem_write_read_ring_switch.c
@@ -149,8 +149,6 @@ igt_main
};
int i;
- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
--
2.23.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [igt-dev] [PATCH i-g-t v2 2/7] tests/i915/kms: remove igt_skip_on_simulation()
2019-12-02 6:01 [igt-dev] [PATCH i-g-t v2 0/7] removal of igt_skip_on_simulation() from i915/ tests Swati Sharma
2019-12-02 6:01 ` [igt-dev] [PATCH i-g-t v2 1/7] tests/i915/gem: remove igt_skip_on_simulation() Swati Sharma
@ 2019-12-02 6:01 ` Swati Sharma
2019-12-02 6:01 ` [igt-dev] [PATCH i-g-t v2 3/7] tests/i915: " Swati Sharma
` (5 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Swati Sharma @ 2019-12-02 6:01 UTC (permalink / raw)
To: igt-dev; +Cc: lucas.demarchi, martin.peres, maarten.lankhorst
Removing igt_skip_on_simulation() from all the kms tests
since this feature is not supported anymore.
v2: Rebase
Signed-off-by: Swati Sharma <swati2.sharma@intel.com>
Signed-off-by: Karthik B S <karthik.b.s@intel.com>
Reviewed-by: Martin Peres <martin.peres@linux.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 b44b0bf1..0172fcb6 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 d5eb902f..af323216 100644
--- a/tests/kms_content_protection.c
+++ b/tests/kms_content_protection.c
@@ -648,8 +648,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 0125122e..f0569b20 100644
--- a/tests/kms_cursor_crc.c
+++ b/tests/kms_cursor_crc.c
@@ -711,8 +711,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 72f17538..9ef3a7f3 100644
--- a/tests/kms_plane.c
+++ b/tests/kms_plane.c
@@ -912,8 +912,6 @@ igt_main_args("", long_opts, help_str, opt_handler, &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_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
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [igt-dev] [PATCH i-g-t v2 3/7] tests/i915: remove igt_skip_on_simulation()
2019-12-02 6:01 [igt-dev] [PATCH i-g-t v2 0/7] removal of igt_skip_on_simulation() from i915/ tests Swati Sharma
2019-12-02 6:01 ` [igt-dev] [PATCH i-g-t v2 1/7] tests/i915/gem: remove igt_skip_on_simulation() Swati Sharma
2019-12-02 6:01 ` [igt-dev] [PATCH i-g-t v2 2/7] tests/i915/kms: " Swati Sharma
@ 2019-12-02 6:01 ` Swati Sharma
2019-12-02 6:01 ` [igt-dev] [PATCH i-g-t v2 4/7] tests: " Swati Sharma
` (4 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Swati Sharma @ 2019-12-02 6:01 UTC (permalink / raw)
To: igt-dev; +Cc: lucas.demarchi, martin.peres, maarten.lankhorst
Removing igt_skip_on_simulation() from all i915 specific
tests since this feature is not supported anymore.
v2: Rebase
Signed-off-by: Swati Sharma <swati2.sharma@intel.com>
Signed-off-by: Karthik B S <karthik.b.s@intel.com>
Reviewed-by: Martin Peres <martin.peres@linux.intel.com>
---
tests/i915/i915_hangman.c | 2 --
tests/i915/i915_pm_backlight.c | 2 --
tests/i915/i915_pm_dc.c | 1 -
tests/i915/i915_pm_rc6_residency.c | 2 --
tests/i915/i915_pm_rps.c | 2 --
tests/i915/i915_pm_sseu.c | 3 ---
tests/i915/i915_suspend.c | 2 --
7 files changed, 14 deletions(-)
diff --git a/tests/i915/i915_hangman.c b/tests/i915/i915_hangman.c
index 7a158d8d..e2dd58e8 100644
--- a/tests/i915/i915_hangman.c
+++ b/tests/i915/i915_hangman.c
@@ -260,8 +260,6 @@ igt_main
const struct intel_execution_engine2 *e;
igt_hang_t hang = {};
- igt_skip_on_simulation();
-
igt_fixture {
device = drm_open_driver(DRIVER_INTEL);
igt_require_gem(device);
diff --git a/tests/i915/i915_pm_backlight.c b/tests/i915/i915_pm_backlight.c
index 9a5f4c37..83b1ed68 100644
--- a/tests/i915/i915_pm_backlight.c
+++ b/tests/i915/i915_pm_backlight.c
@@ -187,8 +187,6 @@ igt_main
igt_output_t *output;
struct igt_fb fb;
- igt_skip_on_simulation();
-
igt_fixture {
enum pipe pipe;
bool found = false;
diff --git a/tests/i915/i915_pm_dc.c b/tests/i915/i915_pm_dc.c
index 2cf357a2..455d4ba1 100644
--- a/tests/i915/i915_pm_dc.c
+++ b/tests/i915/i915_pm_dc.c
@@ -381,7 +381,6 @@ int main(int argc, char *argv[])
{
data_t data = {};
- igt_skip_on_simulation();
igt_subtest_init(argc, argv);
igt_fixture {
data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
diff --git a/tests/i915/i915_pm_rc6_residency.c b/tests/i915/i915_pm_rc6_residency.c
index 1b52e4f5..1b39c870 100644
--- a/tests/i915/i915_pm_rc6_residency.c
+++ b/tests/i915/i915_pm_rc6_residency.c
@@ -200,8 +200,6 @@ igt_main
unsigned int rc6_enabled = 0;
unsigned int devid = 0;
- igt_skip_on_simulation();
-
/* Use drm_open_driver to verify device existence */
igt_fixture {
int fd;
diff --git a/tests/i915/i915_pm_rps.c b/tests/i915/i915_pm_rps.c
index 51605f29..b65eefb0 100644
--- a/tests/i915/i915_pm_rps.c
+++ b/tests/i915/i915_pm_rps.c
@@ -628,8 +628,6 @@ static void pm_rps_exit_handler(int sig)
igt_main
{
- igt_skip_on_simulation();
-
igt_fixture {
struct sysfs_file *sysfs_file = sysfs_files;
char sysfs_path[80];
diff --git a/tests/i915/i915_pm_sseu.c b/tests/i915/i915_pm_sseu.c
index 0b936982..e671e190 100644
--- a/tests/i915/i915_pm_sseu.c
+++ b/tests/i915/i915_pm_sseu.c
@@ -352,9 +352,6 @@ full_enable(void)
const int spin_msec = 10;
int ret, spins;
- /* Simulation doesn't currently model slice/subslice/EU power gating. */
- igt_skip_on_simulation();
-
/*
* Gen9 SKL is the first case in which render power gating can leave
* slice/subslice/EU in a partially enabled state upon resumption of
diff --git a/tests/i915/i915_suspend.c b/tests/i915/i915_suspend.c
index 17c68cc1..5a2ec766 100644
--- a/tests/i915/i915_suspend.c
+++ b/tests/i915/i915_suspend.c
@@ -205,8 +205,6 @@ int fd;
igt_main
{
- igt_skip_on_simulation();
-
igt_fixture
fd = drm_open_driver(DRIVER_INTEL);
--
2.23.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [igt-dev] [PATCH i-g-t v2 4/7] tests: remove igt_skip_on_simulation()
2019-12-02 6:01 [igt-dev] [PATCH i-g-t v2 0/7] removal of igt_skip_on_simulation() from i915/ tests Swati Sharma
` (2 preceding siblings ...)
2019-12-02 6:01 ` [igt-dev] [PATCH i-g-t v2 3/7] tests/i915: " Swati Sharma
@ 2019-12-02 6:01 ` Swati Sharma
2019-12-02 6:01 ` [igt-dev] [PATCH i-g-t v2 5/7] tools: " Swati Sharma
` (3 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Swati Sharma @ 2019-12-02 6:01 UTC (permalink / raw)
To: igt-dev; +Cc: lucas.demarchi, martin.peres, maarten.lankhorst
Removing igt_skip_on_simulation() from tests since
this feature is not supported anymore.
v2: Rebase
Signed-off-by: Swati Sharma <swati2.sharma@intel.com>
Signed-off-by: Karthik B S <karthik.b.s@intel.com>
Reviewed-by: Martin Peres <martin.peres@linux.intel.com>
---
tests/debugfs_test.c | 2 --
tests/perf.c | 2 --
tests/prime_busy.c | 1 -
tests/prime_mmap_kms.c | 2 --
tests/prime_udl.c | 2 --
tests/testdisplay.c | 1 -
tests/tools_test.c | 2 --
7 files changed, 12 deletions(-)
diff --git a/tests/debugfs_test.c b/tests/debugfs_test.c
index 2d4753df..73b82eda 100644
--- a/tests/debugfs_test.c
+++ b/tests/debugfs_test.c
@@ -151,8 +151,6 @@ igt_main
{
int fd = -1, debugfs, sysfs;
- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver_master(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/perf.c b/tests/perf.c
index 5ad8b2db..e4eb8378 100644
--- a/tests/perf.c
+++ b/tests/perf.c
@@ -4066,8 +4066,6 @@ test_sysctl_defaults(void)
igt_main
{
- igt_skip_on_simulation();
-
igt_fixture {
struct stat sb;
diff --git a/tests/prime_busy.c b/tests/prime_busy.c
index bb29216e..1e94805e 100644
--- a/tests/prime_busy.c
+++ b/tests/prime_busy.c
@@ -204,7 +204,6 @@ static void test_engine_mode(int fd,
}
else
{
- igt_skip_on_simulation();
hang = igt_allow_hang(fd, 0, 0);
}
}
diff --git a/tests/prime_mmap_kms.c b/tests/prime_mmap_kms.c
index 1c963e01..29aec499 100644
--- a/tests/prime_mmap_kms.c
+++ b/tests/prime_mmap_kms.c
@@ -239,8 +239,6 @@ igt_main
{
gpu_process_t gpu;
- igt_skip_on_simulation();
-
igt_fixture {
gpu.drm_fd = drm_open_driver_master(DRIVER_INTEL);
igt_skip_on((check_for_dma_buf_mmap(gpu.drm_fd) != 0));
diff --git a/tests/prime_udl.c b/tests/prime_udl.c
index 59f478f7..9b600659 100644
--- a/tests/prime_udl.c
+++ b/tests/prime_udl.c
@@ -147,8 +147,6 @@ out:
igt_simple_main
{
- igt_skip_on_simulation();
-
igt_assert(find_and_open_devices() >= 0);
igt_skip_on(udl_fd == -1);
diff --git a/tests/testdisplay.c b/tests/testdisplay.c
index 2fdc0236..858af7ca 100644
--- a/tests/testdisplay.c
+++ b/tests/testdisplay.c
@@ -696,7 +696,6 @@ igt_simple_main_args(optstr, long_opts, help_str, opt_handler, NULL)
int ret = 0;
GIOChannel *stdinchannel;
GMainLoop *mainloop;
- igt_skip_on_simulation();
enter_exec_path();
diff --git a/tests/tools_test.c b/tests/tools_test.c
index 08b5626f..237f0433 100644
--- a/tests/tools_test.c
+++ b/tests/tools_test.c
@@ -94,8 +94,6 @@ static bool chdir_to_tools_dir(void)
igt_main
{
- igt_skip_on_simulation();
-
igt_fixture {
char *path;
--
2.23.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [igt-dev] [PATCH i-g-t v2 5/7] tools: remove igt_skip_on_simulation()
2019-12-02 6:01 [igt-dev] [PATCH i-g-t v2 0/7] removal of igt_skip_on_simulation() from i915/ tests Swati Sharma
` (3 preceding siblings ...)
2019-12-02 6:01 ` [igt-dev] [PATCH i-g-t v2 4/7] tests: " Swati Sharma
@ 2019-12-02 6:01 ` Swati Sharma
2019-12-02 6:01 ` [igt-dev] [PATCH i-g-t v2 6/7] benchmarks: " Swati Sharma
` (2 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Swati Sharma @ 2019-12-02 6:01 UTC (permalink / raw)
To: igt-dev; +Cc: lucas.demarchi, martin.peres, maarten.lankhorst
Removing igt_skip_on_simulation() from tools since this
feature is not supported anymore.
v2: Rebase
Signed-off-by: Swati Sharma <swati2.sharma@intel.com>
Signed-off-by: Karthik B S <karthik.b.s@intel.com>
Reviewed-by: Martin Peres <martin.peres@linux.intel.com>
---
tools/intel_dp_compliance.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/tools/intel_dp_compliance.c b/tools/intel_dp_compliance.c
index 14631a46..5cc3d37a 100644
--- a/tools/intel_dp_compliance.c
+++ b/tools/intel_dp_compliance.c
@@ -1017,8 +1017,6 @@ int main(int argc, char **argv)
{"help", 0, 0, 'h'},
};
- igt_skip_on_simulation();
-
enter_exec_path(argv);
while ((c = getopt_long(argc, argv, optstr, long_opts, NULL)) != -1) {
--
2.23.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [igt-dev] [PATCH i-g-t v2 6/7] benchmarks: remove igt_skip_on_simulation()
2019-12-02 6:01 [igt-dev] [PATCH i-g-t v2 0/7] removal of igt_skip_on_simulation() from i915/ tests Swati Sharma
` (4 preceding siblings ...)
2019-12-02 6:01 ` [igt-dev] [PATCH i-g-t v2 5/7] tools: " Swati Sharma
@ 2019-12-02 6:01 ` Swati Sharma
2019-12-02 6:01 ` [igt-dev] [PATCH i-g-t v2 7/7] lib: remove igt_skip_on_simulation Swati Sharma
2019-12-03 5:17 ` [igt-dev] [PATCH i-g-t v2 0/7] removal of igt_skip_on_simulation() from i915/ tests Summers, Stuart
7 siblings, 0 replies; 10+ messages in thread
From: Swati Sharma @ 2019-12-02 6:01 UTC (permalink / raw)
To: igt-dev; +Cc: lucas.demarchi, martin.peres, maarten.lankhorst
Removing igt_skip_on_simulation() from benchmarks since
this feature is not supported anymore.
v2: Rebase
Signed-off-by: Swati Sharma <swati2.sharma@intel.com>
Signed-off-by: Karthik B S <karthik.b.s@intel.com>
Reviewed-by: Martin Peres <martin.peres@linux.intel.com>
---
benchmarks/gem_userptr_benchmark.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/benchmarks/gem_userptr_benchmark.c b/benchmarks/gem_userptr_benchmark.c
index bef2ccc4..b63fdedf 100644
--- a/benchmarks/gem_userptr_benchmark.c
+++ b/benchmarks/gem_userptr_benchmark.c
@@ -469,8 +469,6 @@ int main(int argc, char **argv)
{
int fd = -1, ret;
- igt_skip_on_simulation();
-
igt_subtest_init(argc, argv);
fd = drm_open_driver(DRIVER_INTEL);
--
2.23.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [igt-dev] [PATCH i-g-t v2 7/7] lib: remove igt_skip_on_simulation
2019-12-02 6:01 [igt-dev] [PATCH i-g-t v2 0/7] removal of igt_skip_on_simulation() from i915/ tests Swati Sharma
` (5 preceding siblings ...)
2019-12-02 6:01 ` [igt-dev] [PATCH i-g-t v2 6/7] benchmarks: " Swati Sharma
@ 2019-12-02 6:01 ` Swati Sharma
2019-12-03 5:17 ` [igt-dev] [PATCH i-g-t v2 0/7] removal of igt_skip_on_simulation() from i915/ tests Summers, Stuart
7 siblings, 0 replies; 10+ messages in thread
From: Swati Sharma @ 2019-12-02 6:01 UTC (permalink / raw)
To: igt-dev; +Cc: lucas.demarchi, martin.peres, maarten.lankhorst
Removing igt_skip_on_simulation() from lib since this feature
is not supported anymore. Func() defination hasn't been removed
since it can be used by some other drivers (currently amd is using
this function).
v2: Rebase
Signed-off-by: Swati Sharma <swati2.sharma@intel.com>
Signed-off-by: Karthik B S <karthik.b.s@intel.com>
Reviewed-by: Martin Peres <martin.peres@linux.intel.com>
---
lib/igt_aux.c | 7 -------
lib/intel_os.c | 2 --
2 files changed, 9 deletions(-)
diff --git a/lib/igt_aux.c b/lib/igt_aux.c
index 578f8579..55632fd0 100644
--- a/lib/igt_aux.c
+++ b/lib/igt_aux.c
@@ -854,11 +854,6 @@ void igt_system_suspend_autoresume(enum igt_suspend_state state,
int power_dir;
enum igt_suspend_test orig_test;
- /* FIXME: Simulation doesn't like suspend/resume, and not even a lighter
- * approach using /sys/power/pm_test to just test our driver's callbacks
- * seems to fare better. We need to investigate what's going on. */
- igt_skip_on_simulation();
-
igt_require((power_dir = open("/sys/power", O_RDONLY)) >= 0);
igt_require(get_supported_suspend_states(power_dir) & (1 << state));
igt_require(test == SUSPEND_TEST_NONE ||
@@ -905,8 +900,6 @@ void igt_set_autoresume_delay(int delay_secs)
int delay_fd;
char delay_str[10];
- igt_skip_on_simulation();
-
delay_fd = open("/sys/module/suspend/parameters/pm_test_delay", O_RDWR);
if (delay_fd >= 0) {
diff --git a/lib/intel_os.c b/lib/intel_os.c
index 505831c0..8458d39a 100644
--- a/lib/intel_os.c
+++ b/lib/intel_os.c
@@ -365,8 +365,6 @@ void intel_require_memory(uint64_t count, uint64_t size, unsigned mode)
uint64_t required, total;
bool sufficient_memory;
- igt_skip_on_simulation();
-
sufficient_memory = __intel_check_memory(count, size, mode,
&required, &total);
if (!sufficient_memory) {
--
2.23.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2 0/7] removal of igt_skip_on_simulation() from i915/ tests
2019-12-02 6:01 [igt-dev] [PATCH i-g-t v2 0/7] removal of igt_skip_on_simulation() from i915/ tests Swati Sharma
` (6 preceding siblings ...)
2019-12-02 6:01 ` [igt-dev] [PATCH i-g-t v2 7/7] lib: remove igt_skip_on_simulation Swati Sharma
@ 2019-12-03 5:17 ` Summers, Stuart
7 siblings, 0 replies; 10+ messages in thread
From: Summers, Stuart @ 2019-12-03 5:17 UTC (permalink / raw)
To: igt-dev, Sharma, Swati2
Cc: De Marchi, Lucas, Peres, Martin, Lankhorst, Maarten
[-- Attachment #1.1: Type: text/plain, Size: 7151 bytes --]
On Mon, 2019-12-02 at 11:31 +0530, Swati Sharma wrote:
> Removing igt_skip_on_simulation() since this feature is not supported
> anymore by i915 driver. Removing it from gem, kms, i915 specific,
Can you be a little more specific about why we need to do this? Which
support was removed? Or is it simply that we're relying more on the IGT
infrastructure, i.e. skip, require_platform, etc, to determine whether
a test should be run in a particular environment?
Thanks,
Stuart
> tools
> and benchmark tests.
>
> Swati Sharma (7):
> tests/i915/gem: remove igt_skip_on_simulation()
> tests/i915/kms: remove igt_skip_on_simulation()
> tests/i915: remove igt_skip_on_simulation()
> tests: remove igt_skip_on_simulation()
> tools: remove igt_skip_on_simulation()
> benchmarks: remove igt_skip_on_simulation()
> lib: remove igt_skip_on_simulation
>
> benchmarks/gem_userptr_benchmark.c | 2 --
> lib/igt_aux.c | 7 -------
> lib/intel_os.c | 2 --
> tests/debugfs_test.c | 2 --
> tests/i915/gem_busy.c | 2 --
> tests/i915/gem_caching.c | 2 --
> tests/i915/gem_concurrent_all.c | 2 --
> tests/i915/gem_create.c | 2 --
> tests/i915/gem_cs_prefetch.c | 2 --
> tests/i915/gem_cs_tlb.c | 2 --
> tests/i915/gem_ctx_exec.c | 2 --
> tests/i915/gem_ctx_switch.c | 6 ------
> tests/i915/gem_ctx_thrash.c | 2 --
> tests/i915/gem_double_irq_loop.c | 2 --
> tests/i915/gem_eio.c | 2 --
> tests/i915/gem_exec_async.c | 2 --
> tests/i915/gem_exec_balancer.c | 2 --
> tests/i915/gem_exec_blt.c | 2 --
> tests/i915/gem_exec_capture.c | 2 --
> tests/i915/gem_exec_fence.c | 2 --
> tests/i915/gem_exec_gttfill.c | 2 --
> tests/i915/gem_exec_lut_handle.c | 2 --
> tests/i915/gem_exec_schedule.c | 2 --
> tests/i915/gem_exec_suspend.c | 2 --
> tests/i915/gem_fence_thrash.c | 2 --
> tests/i915/gem_fence_upload.c | 2 --
> tests/i915/gem_fenced_exec_thrash.c | 2 --
> tests/i915/gem_flink_race.c | 2 --
> tests/i915/gem_gtt_cpu_tlb.c | 2 --
> tests/i915/gem_gtt_hog.c | 2 --
> tests/i915/gem_gtt_speed.c | 2 --
> tests/i915/gem_largeobject.c | 2 --
> tests/i915/gem_madvise.c | 2 --
> tests/i915/gem_mmap_offset_exhaustion.c | 2 --
> tests/i915/gem_partial_pwrite_pread.c | 2 --
> tests/i915/gem_persistent_relocs.c | 2 --
> tests/i915/gem_pread_after_blit.c | 2 --
> tests/i915/gem_pwrite_pread.c | 2 --
> tests/i915/gem_pwrite_snooped.c | 2 --
> tests/i915/gem_read_read_speed.c | 2 --
> tests/i915/gem_readwrite.c | 2 --
> tests/i915/gem_reloc_vs_gpu.c | 2 --
> tests/i915/gem_render_linear_blits.c | 3 ---
> tests/i915/gem_render_tiled_blits.c | 3 ---
> tests/i915/gem_reset_stats.c | 1 -
> tests/i915/gem_ringfill.c | 2 --
> tests/i915/gem_set_tiling_vs_blt.c | 2 --
> tests/i915/gem_set_tiling_vs_gtt.c | 2 --
> tests/i915/gem_set_tiling_vs_pwrite.c | 2 --
> tests/i915/gem_shrink.c | 2 --
> tests/i915/gem_softpin.c | 2 --
> tests/i915/gem_spin_batch.c | 2 --
> tests/i915/gem_stolen.c | 2 --
> tests/i915/gem_storedw_batches_loop.c | 2 --
> tests/i915/gem_sync.c | 2 --
> tests/i915/gem_threaded_access_tiled.c | 2 --
> tests/i915/gem_tiled_fence_blits.c | 3 ---
> tests/i915/gem_tiled_partial_pwrite_pread.c | 2 --
> tests/i915/gem_unfence_active_buffers.c | 2 --
> tests/i915/gem_unref_active_buffers.c | 2 --
> tests/i915/gem_wait.c | 2 --
> tests/i915/gem_write_read_ring_switch.c | 2 --
> tests/i915/i915_hangman.c | 2 --
> tests/i915/i915_pm_backlight.c | 2 --
> tests/i915/i915_pm_dc.c | 1 -
> tests/i915/i915_pm_rc6_residency.c | 2 --
> tests/i915/i915_pm_rps.c | 2 --
> tests/i915/i915_pm_sseu.c | 3 ---
> tests/i915/i915_suspend.c | 2 --
> 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 --
> tests/perf.c | 2 --
> tests/prime_busy.c | 1 -
> tests/prime_mmap_kms.c | 2 --
> tests/prime_udl.c | 2 --
> tests/testdisplay.c | 1 -
> tests/tools_test.c | 2 --
> tools/intel_dp_compliance.c | 2 --
> 113 files changed, 235 deletions(-)
>
[-- Attachment #1.2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 3270 bytes --]
[-- Attachment #2: Type: text/plain, Size: 153 bytes --]
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 10+ messages in thread
* [igt-dev] [PATCH i-g-t v2 0/7] removal of igt_skip_on_simulation() from i915/ tests
@ 2019-12-02 14:03 Swati Sharma
0 siblings, 0 replies; 10+ messages in thread
From: Swati Sharma @ 2019-12-02 14:03 UTC (permalink / raw)
To: igt-dev; +Cc: lucas.demarchi, martin.peres, maarten.lankhorst
Removing igt_skip_on_simulation() since this feature is not supported
anymore by i915 driver. Removing it from gem, kms, i915 specific, tools
and benchmark tests.
Swati Sharma (7):
tests/i915/gem: remove igt_skip_on_simulation()
tests/i915/kms: remove igt_skip_on_simulation()
tests/i915: remove igt_skip_on_simulation()
tests: remove igt_skip_on_simulation()
tools: remove igt_skip_on_simulation()
benchmarks: remove igt_skip_on_simulation()
lib: remove igt_skip_on_simulation
benchmarks/gem_userptr_benchmark.c | 2 --
lib/igt_aux.c | 7 -------
lib/intel_os.c | 2 --
tests/debugfs_test.c | 2 --
tests/dumb_buffer.c | 2 --
tests/i915/gem_busy.c | 2 --
tests/i915/gem_caching.c | 2 --
tests/i915/gem_concurrent_all.c | 2 --
tests/i915/gem_create.c | 2 --
tests/i915/gem_cs_prefetch.c | 2 --
tests/i915/gem_cs_tlb.c | 2 --
tests/i915/gem_ctx_exec.c | 2 --
tests/i915/gem_ctx_switch.c | 6 ------
tests/i915/gem_ctx_thrash.c | 2 --
tests/i915/gem_double_irq_loop.c | 2 --
tests/i915/gem_eio.c | 2 --
tests/i915/gem_exec_async.c | 2 --
tests/i915/gem_exec_balancer.c | 2 --
tests/i915/gem_exec_capture.c | 2 --
tests/i915/gem_exec_fence.c | 2 --
tests/i915/gem_exec_gttfill.c | 2 --
tests/i915/gem_exec_lut_handle.c | 2 --
tests/i915/gem_exec_schedule.c | 2 --
tests/i915/gem_exec_suspend.c | 2 --
tests/i915/gem_fence_thrash.c | 2 --
tests/i915/gem_fence_upload.c | 2 --
tests/i915/gem_fenced_exec_thrash.c | 2 --
tests/i915/gem_flink_race.c | 2 --
tests/i915/gem_gtt_cpu_tlb.c | 2 --
tests/i915/gem_gtt_hog.c | 2 --
tests/i915/gem_gtt_speed.c | 2 --
tests/i915/gem_largeobject.c | 2 --
tests/i915/gem_madvise.c | 2 --
tests/i915/gem_mmap_offset_exhaustion.c | 2 --
tests/i915/gem_partial_pwrite_pread.c | 2 --
tests/i915/gem_persistent_relocs.c | 2 --
tests/i915/gem_pread_after_blit.c | 2 --
tests/i915/gem_pwrite_pread.c | 2 --
tests/i915/gem_pwrite_snooped.c | 2 --
tests/i915/gem_read_read_speed.c | 2 --
tests/i915/gem_readwrite.c | 2 --
tests/i915/gem_reloc_vs_gpu.c | 2 --
tests/i915/gem_render_linear_blits.c | 3 ---
tests/i915/gem_render_tiled_blits.c | 3 ---
tests/i915/gem_reset_stats.c | 1 -
tests/i915/gem_ringfill.c | 2 --
tests/i915/gem_set_tiling_vs_blt.c | 2 --
tests/i915/gem_set_tiling_vs_gtt.c | 2 --
tests/i915/gem_set_tiling_vs_pwrite.c | 2 --
tests/i915/gem_shrink.c | 2 --
tests/i915/gem_softpin.c | 2 --
tests/i915/gem_spin_batch.c | 2 --
tests/i915/gem_stolen.c | 2 --
tests/i915/gem_storedw_batches_loop.c | 2 --
tests/i915/gem_sync.c | 2 --
tests/i915/gem_threaded_access_tiled.c | 2 --
tests/i915/gem_tiled_fence_blits.c | 3 ---
tests/i915/gem_tiled_partial_pwrite_pread.c | 2 --
tests/i915/gem_unfence_active_buffers.c | 2 --
tests/i915/gem_unref_active_buffers.c | 2 --
tests/i915/gem_wait.c | 2 --
tests/i915/gem_write_read_ring_switch.c | 2 --
tests/i915/i915_hangman.c | 2 --
tests/i915/i915_pm_backlight.c | 2 --
tests/i915/i915_pm_dc.c | 1 -
tests/i915/i915_pm_rc6_residency.c | 2 --
tests/i915/i915_pm_rps.c | 2 --
tests/i915/i915_pm_sseu.c | 3 ---
tests/i915/i915_suspend.c | 2 --
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 --
tests/perf.c | 2 --
tests/prime_busy.c | 1 -
tests/prime_mmap_kms.c | 2 --
tests/prime_udl.c | 2 --
tests/testdisplay.c | 1 -
tests/tools_test.c | 2 --
tools/intel_dp_compliance.c | 2 --
113 files changed, 235 deletions(-)
--
2.24.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2019-12-03 5:17 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-02 6:01 [igt-dev] [PATCH i-g-t v2 0/7] removal of igt_skip_on_simulation() from i915/ tests Swati Sharma
2019-12-02 6:01 ` [igt-dev] [PATCH i-g-t v2 1/7] tests/i915/gem: remove igt_skip_on_simulation() Swati Sharma
2019-12-02 6:01 ` [igt-dev] [PATCH i-g-t v2 2/7] tests/i915/kms: " Swati Sharma
2019-12-02 6:01 ` [igt-dev] [PATCH i-g-t v2 3/7] tests/i915: " Swati Sharma
2019-12-02 6:01 ` [igt-dev] [PATCH i-g-t v2 4/7] tests: " Swati Sharma
2019-12-02 6:01 ` [igt-dev] [PATCH i-g-t v2 5/7] tools: " Swati Sharma
2019-12-02 6:01 ` [igt-dev] [PATCH i-g-t v2 6/7] benchmarks: " Swati Sharma
2019-12-02 6:01 ` [igt-dev] [PATCH i-g-t v2 7/7] lib: remove igt_skip_on_simulation Swati Sharma
2019-12-03 5:17 ` [igt-dev] [PATCH i-g-t v2 0/7] removal of igt_skip_on_simulation() from i915/ tests Summers, Stuart
2019-12-02 14:03 Swati Sharma
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.