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

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

Removing igt_skip_on_simulation() from all i915 specific
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/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 58141fc9..cdf62ac7 100644
--- a/tests/i915/i915_hangman.c
+++ b/tests/i915/i915_hangman.c
@@ -259,8 +259,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 ce3319b7..d470d391 100644
--- a/tests/i915/i915_pm_dc.c
+++ b/tests/i915/i915_pm_dc.c
@@ -242,7 +242,6 @@ int main(int argc, char *argv[])
bool has_runtime_pm;
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 478c7be7..3b78d326 100644
--- a/tests/i915/i915_pm_rps.c
+++ b/tests/i915/i915_pm_rps.c
@@ -626,8 +626,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