[PATCH 73/83] drm/i915: Remove defunct intel_suspend_gt_powersave()
Chris Wilson
chris at chris-wilson.co.uk
Sat Jun 30 08:25:46 UTC 2018
Since commit b7137e0cf1e5 ("drm/i915: Defer enabling rc6 til after we
submit the first batch/context"), intel_suspend_gt_powersave() has been
a no-op. As we still do not need to do anything explicitly on suspend
(we do everything required on idling), remove the defunct function.
References: b7137e0cf1e5 ("drm/i915: Defer enabling rc6 til after we submit the first batch/context")
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Reviewed-by: Sagar Arun Kamble <sagar.a.kamble at intel.com>
---
drivers/gpu/drm/i915/i915_gem.c | 1 -
drivers/gpu/drm/i915/intel_gt_pm.c | 16 ----------------
drivers/gpu/drm/i915/intel_gt_pm.h | 1 -
3 files changed, 18 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 405649e3b6f2..b16d70a7b1a5 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4644,7 +4644,6 @@ int i915_gem_suspend(struct drm_i915_private *i915)
GEM_TRACE("\n");
intel_runtime_pm_get(i915);
- intel_suspend_gt_powersave(i915);
flush_workqueue(i915->wq);
diff --git a/drivers/gpu/drm/i915/intel_gt_pm.c b/drivers/gpu/drm/i915/intel_gt_pm.c
index f096c5cb84ba..f8b75814796d 100644
--- a/drivers/gpu/drm/i915/intel_gt_pm.c
+++ b/drivers/gpu/drm/i915/intel_gt_pm.c
@@ -2491,22 +2491,6 @@ void intel_cleanup_gt_powersave(struct drm_i915_private *i915)
intel_runtime_pm_put(i915);
}
-/**
- * intel_suspend_gt_powersave - suspend PM work and helper threads
- * @i915: i915 device
- *
- * We don't want to disable RC6 or other features here, we just want
- * to make sure any work we've queued has finished and won't bother
- * us while we're suspended.
- */
-void intel_suspend_gt_powersave(struct drm_i915_private *i915)
-{
- if (INTEL_GEN(i915) < 6)
- return;
-
- /* gen6_rps_idle() will be called later to disable interrupts */
-}
-
void intel_sanitize_gt_powersave(struct drm_i915_private *i915)
{
i915->gt_pm.rps.enabled = true; /* force RPS disabling */
diff --git a/drivers/gpu/drm/i915/intel_gt_pm.h b/drivers/gpu/drm/i915/intel_gt_pm.h
index 7a14a2e14b30..afb7a5858dff 100644
--- a/drivers/gpu/drm/i915/intel_gt_pm.h
+++ b/drivers/gpu/drm/i915/intel_gt_pm.h
@@ -98,7 +98,6 @@ void intel_cleanup_gt_powersave(struct drm_i915_private *i915);
void intel_sanitize_gt_powersave(struct drm_i915_private *i915);
void intel_enable_gt_powersave(struct drm_i915_private *i915);
void intel_disable_gt_powersave(struct drm_i915_private *i915);
-void intel_suspend_gt_powersave(struct drm_i915_private *i915);
void intel_gt_pm_irq_handler(struct drm_i915_private *i915, u32 pm_iir);
--
2.18.0
More information about the Intel-gfx-trybot
mailing list