[igt-dev] [PATCH 7/7] lib: remove igt_skip_on_simulation

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

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).

Signed-off-by: Swati Sharma <swati2.sharma@intel.com>
Signed-off-by: Karthik B S <karthik.b.s@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