[PATCH 3/3] sleep-now

[Chris Wilson]

---
 drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 3 ++-
 drivers/gpu/drm/i915/selftests/intel_uncore.c      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
index 50aa7e95124d..646edab48c78 100644
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
@@ -382,6 +382,7 @@ static bool assert_mmap_offset(struct drm_i915_private *i915,
 
 static void disable_retire_worker(struct drm_i915_private *i915)
 {
+	i915_gem_suspend(i915);
 	i915_gem_driver_unregister__shrinker(i915);
 
 	intel_gt_pm_get(&i915->gt);
@@ -424,7 +425,7 @@ static int igt_mmap_offset_exhaustion(void *arg)
 
 	/* Disable background reaper */
 	disable_retire_worker(i915);
-	GEM_BUG_ON(!i915->gt.awake);
+	GEM_BUG_ON(intel_gt_pm_is_awake(&i915->gt));
 
 	/* Trim the device mmap space to only a page */
 	memset(&resv, 0, sizeof(resv));
diff --git a/drivers/gpu/drm/i915/selftests/intel_uncore.c b/drivers/gpu/drm/i915/selftests/intel_uncore.c
index 86815c6072a1..33544c419082 100644
--- a/drivers/gpu/drm/i915/selftests/intel_uncore.c
+++ b/drivers/gpu/drm/i915/selftests/intel_uncore.c
@@ -147,7 +147,8 @@ static int live_forcewake_ops(void *arg)
 	unsigned int tmp;
 	int err = 0;
 
-	GEM_BUG_ON(i915->gt.awake);
+	i915_gem_suspend(i915);
+	GEM_BUG_ON(intel_gt_pm_is_awake(&i915->gt));
 
 	/* vlv/chv with their pcu behave differently wrt reads */
 	if (IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915)) {
-- 
2.23.0.rc1