[PATCH 17/35] simplify-rc6-init
Chris Wilson
chris at chris-wilson.co.uk
Sat Dec 9 00:45:12 UTC 2017
---
drivers/gpu/drm/i915/i915_debugfs.c | 5 +--
drivers/gpu/drm/i915/i915_drv.c | 3 --
drivers/gpu/drm/i915/i915_drv.h | 12 +-----
drivers/gpu/drm/i915/i915_gem.c | 6 +--
drivers/gpu/drm/i915/intel_gt_pm.c | 83 +++++++++++--------------------------
5 files changed, 29 insertions(+), 80 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 91f0c0a7ee2b..35a01b4d4eb1 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2208,7 +2208,6 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)
struct intel_rps *rps = &dev_priv->gt_pm.rps;
struct drm_file *file;
- seq_printf(m, "RPS enabled? %d\n", rps->enabled);
seq_printf(m, "GPU busy? %s [%d requests]\n",
yesno(dev_priv->gt.awake), dev_priv->gt.active_requests);
seq_printf(m, "CPU waiting? %d\n", count_irq_waiters(dev_priv));
@@ -2243,9 +2242,7 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)
atomic_read(&rps->boosts));
mutex_unlock(&dev->filelist_mutex);
- if (INTEL_GEN(dev_priv) >= 6 &&
- rps->enabled &&
- dev_priv->gt.active_requests) {
+ if (INTEL_GEN(dev_priv) >= 6 && dev_priv->gt.awake) {
u32 rpup, rpupei;
u32 rpdown, rpdownei;
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index a574eb3b9e89..cbe7f2d969cc 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -2549,9 +2549,6 @@ static int intel_runtime_suspend(struct device *kdev)
struct drm_i915_private *dev_priv = to_i915(dev);
int ret;
- if (WARN_ON_ONCE(!(dev_priv->gt_pm.rc6.enabled && HAS_RC6(dev_priv))))
- return -ENODEV;
-
if (WARN_ON_ONCE(!HAS_RUNTIME_PM(dev_priv)))
return -ENODEV;
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 2c97703ba666..fd41f45a9a79 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1377,7 +1377,6 @@ struct intel_rps {
int last_adj;
enum { LOW_POWER, BETWEEN, HIGH_POWER } power;
- bool enabled;
atomic_t num_waiters;
atomic_t boosts;
@@ -1385,13 +1384,8 @@ struct intel_rps {
struct intel_rps_ei ei;
};
-struct intel_rc6 {
- bool enabled;
-};
-
-struct intel_gen6_power_mgmt {
+struct intel_gt_pm {
struct intel_rps rps;
- struct intel_rc6 rc6;
};
/* defined intel_pm.c */
@@ -2455,9 +2449,7 @@ struct drm_i915_private {
* talking to hw - so only take it when talking to hw!
*/
struct mutex pcu_lock;
-
- /* gen6+ GT PM state */
- struct intel_gen6_power_mgmt gt_pm;
+ struct intel_gt_pm gt_pm;
/* ilk-only ips/rps state. Everything in here is protected by the global
* mchdev_lock in intel_pm.c */
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index a33ff56144ef..aee616d9e42e 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3126,11 +3126,7 @@ void i915_gem_reset(struct drm_i915_private *dev_priv)
i915_gem_restore_fences(dev_priv);
- if (dev_priv->gt_pm.rc6.enabled) {
- dev_priv->gt_pm.rc6.enabled = false;
- intel_gt_enable_rc6(dev_priv);
- }
-
+ intel_gt_enable_rc6(dev_priv);
if (dev_priv->gt.awake) {
if (INTEL_GEN(dev_priv) >= 6)
gen6_rps_busy(dev_priv);
diff --git a/drivers/gpu/drm/i915/intel_gt_pm.c b/drivers/gpu/drm/i915/intel_gt_pm.c
index e191a6a77851..1ce1d8c08a26 100644
--- a/drivers/gpu/drm/i915/intel_gt_pm.c
+++ b/drivers/gpu/drm/i915/intel_gt_pm.c
@@ -423,33 +423,29 @@ static void vlv_set_rps_idle(struct drm_i915_private *dev_priv)
void gen6_rps_busy(struct drm_i915_private *dev_priv)
{
struct intel_rps *rps = &dev_priv->gt_pm.rps;
+ u8 freq;
if (!HAS_RPS(dev_priv))
return;
mutex_lock(&dev_priv->pcu_lock);
- if (rps->enabled) {
- u8 freq;
- if (dev_priv->pm_rps_events & GEN6_PM_RP_UP_EI_EXPIRED)
- gen6_rps_reset_ei(dev_priv);
- I915_WRITE(GEN6_PMINTRMSK,
- gen6_rps_pm_mask(dev_priv, rps->cur_freq));
+ if (dev_priv->pm_rps_events & GEN6_PM_RP_UP_EI_EXPIRED)
+ gen6_rps_reset_ei(dev_priv);
+ I915_WRITE(GEN6_PMINTRMSK,
+ gen6_rps_pm_mask(dev_priv, rps->cur_freq));
- gen6_enable_rps_interrupts(dev_priv);
+ gen6_enable_rps_interrupts(dev_priv);
- /* Use the user's desired frequency as a guide, but for better
- * performance, jump directly to RPe as our starting frequency.
- */
- freq = max(rps->cur_freq,
- rps->efficient_freq);
-
- if (intel_set_rps(dev_priv,
- clamp(freq,
- rps->min_freq_softlimit,
- rps->max_freq_softlimit)))
- DRM_DEBUG_DRIVER("Failed to set idle frequency\n");
- }
+ /* Use the user's desired frequency as a guide, but for better
+ * performance, jump directly to RPe as our starting frequency.
+ */
+ freq = max(rps->cur_freq, rps->efficient_freq);
+ if (intel_set_rps(dev_priv,
+ clamp(freq,
+ rps->min_freq_softlimit,
+ rps->max_freq_softlimit)))
+ DRM_DEBUG_DRIVER("Failed to set idle frequency\n");
mutex_unlock(&dev_priv->pcu_lock);
}
@@ -468,15 +464,15 @@ void gen6_rps_idle(struct drm_i915_private *dev_priv)
gen6_disable_rps_interrupts(dev_priv);
mutex_lock(&dev_priv->pcu_lock);
- if (rps->enabled) {
- if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
- vlv_set_rps_idle(dev_priv);
- else
- gen6_set_rps(dev_priv, rps->idle_freq);
- rps->last_adj = 0;
- I915_WRITE(GEN6_PMINTRMSK,
- gen6_sanitize_rps_pm_mask(dev_priv, ~0));
- }
+ if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
+ vlv_set_rps_idle(dev_priv);
+ else
+ gen6_set_rps(dev_priv, rps->idle_freq);
+
+ rps->last_adj = 0;
+ I915_WRITE(GEN6_PMINTRMSK,
+ gen6_sanitize_rps_pm_mask(dev_priv, ~0));
+
mutex_unlock(&dev_priv->pcu_lock);
}
@@ -490,12 +486,6 @@ void gen6_rps_boost(struct drm_i915_gem_request *rq,
if (!HAS_RPS(rq->i915))
return;
- /* This is intentionally racy! We peek at the state here, then
- * validate inside the RPS worker.
- */
- if (!rps->enabled)
- return;
-
boost = false;
spin_lock_irqsave(&rq->lock, flags);
if (!rq->waitboost && !i915_gem_request_completed(rq)) {
@@ -522,7 +512,7 @@ int intel_set_rps(struct drm_i915_private *dev_priv, u8 val)
GEM_BUG_ON(val > rps->max_freq);
GEM_BUG_ON(val < rps->min_freq);
- if (!rps->enabled) {
+ if (!dev_priv->gt.awake) {
rps->cur_freq = val;
return 0;
}
@@ -2048,10 +2038,7 @@ static void intel_init_emon(struct drm_i915_private *dev_priv)
void intel_gt_pm_sanitize(struct drm_i915_private *dev_priv)
{
- dev_priv->gt_pm.rps.enabled = true; /* force RPS disabling */
intel_gt_disable_rps(dev_priv);
-
- dev_priv->gt_pm.rc6.enabled = true; /* force RC6 disabling */
intel_gt_disable_rc6(dev_priv);
gen6_reset_rps_interrupts(dev_priv);
@@ -2120,9 +2107,6 @@ static void __enable_rc6(struct drm_i915_private *dev_priv)
{
lockdep_assert_held(&dev_priv->pcu_lock);
- if (dev_priv->gt_pm.rc6.enabled)
- return;
-
if (IS_CHERRYVIEW(dev_priv))
cherryview_enable_rc6(dev_priv);
else if (IS_VALLEYVIEW(dev_priv))
@@ -2133,8 +2117,6 @@ static void __enable_rc6(struct drm_i915_private *dev_priv)
gen8_enable_rc6(dev_priv);
else if (INTEL_GEN(dev_priv) >= 6)
gen6_enable_rc6(dev_priv);
-
- dev_priv->gt_pm.rc6.enabled = true;
}
static void __enable_rps(struct drm_i915_private *dev_priv)
@@ -2143,9 +2125,6 @@ static void __enable_rps(struct drm_i915_private *dev_priv)
lockdep_assert_held(&dev_priv->pcu_lock);
- if (rps->enabled)
- return;
-
if (IS_CHERRYVIEW(dev_priv)) {
cherryview_enable_rps(dev_priv);
} else if (IS_VALLEYVIEW(dev_priv)) {
@@ -2166,8 +2145,6 @@ static void __enable_rps(struct drm_i915_private *dev_priv)
WARN_ON(rps->efficient_freq < rps->min_freq);
WARN_ON(rps->efficient_freq > rps->max_freq);
-
- rps->enabled = true;
}
void intel_gt_enable_rc6(struct drm_i915_private *dev_priv)
@@ -2194,9 +2171,6 @@ static void __disable_rc6(struct drm_i915_private *dev_priv)
{
lockdep_assert_held(&dev_priv->pcu_lock);
- if (!dev_priv->gt_pm.rc6.enabled)
- return;
-
if (INTEL_GEN(dev_priv) >= 9)
gen9_disable_rc6(dev_priv);
else if (IS_CHERRYVIEW(dev_priv))
@@ -2205,8 +2179,6 @@ static void __disable_rc6(struct drm_i915_private *dev_priv)
valleyview_disable_rc6(dev_priv);
else if (INTEL_GEN(dev_priv) >= 6)
gen6_disable_rc6(dev_priv);
-
- dev_priv->gt_pm.rc6.enabled = false;
}
void intel_gt_disable_rc6(struct drm_i915_private *dev_priv)
@@ -2220,9 +2192,6 @@ static void __disable_rps(struct drm_i915_private *dev_priv)
{
lockdep_assert_held(&dev_priv->pcu_lock);
- if (!dev_priv->gt_pm.rps.enabled)
- return;
-
if (INTEL_GEN(dev_priv) >= 9)
gen9_disable_rps(dev_priv);
else if (IS_CHERRYVIEW(dev_priv))
@@ -2233,8 +2202,6 @@ static void __disable_rps(struct drm_i915_private *dev_priv)
gen6_disable_rps(dev_priv);
else if (INTEL_GEN(dev_priv) >= 5)
ironlake_disable_drps(dev_priv);
-
- dev_priv->gt_pm.rps.enabled = false;
}
void intel_gt_disable_rps(struct drm_i915_private *dev_priv)
--
2.15.1
More information about the Intel-gfx-trybot
mailing list