[PATCH 11/31] drm/i915: Introduce separate status variable for RC6 and Ring frequency setup

Sagar Arun Kamble
2017-09-19T17:39:04Z

Defined new struct intel_rc6 to hold RC6 specific state and
intel_ring_pstate to hold ring specific state.

Cc: Imre Deak <imre.deak@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Sagar Arun Kamble <sagar.a.kamble@intel.com>
---
drivers/gpu/drm/i915/i915_drv.c | 2 +-
drivers/gpu/drm/i915/i915_drv.h | 10 +++++++
drivers/gpu/drm/i915/intel_pm.c | 58 ++++++++++++++++++++++++++++++-----------
3 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index a6dbad3..f13a3de 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -2486,7 +2486,7 @@ 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->pm.rps.enabled && intel_rc6_enabled())))
+ if (WARN_ON_ONCE(!(dev_priv->pm.rc6.enabled && intel_rc6_enabled())))
return -ENODEV;

if (WARN_ON_ONCE(!HAS_RUNTIME_PM(dev_priv)))
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index e3264e5..a09952d 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1352,8 +1352,18 @@ struct intel_rps {
struct intel_rps_ei ei;
};

+struct intel_rc6 {
+ bool enabled;
+};
+
+struct intel_ring_pstate {
+ bool configured;
+};
+
struct intel_gen6_power_mgmt {
struct intel_rps rps;
+ struct intel_rc6 rc6;
+ struct intel_ring_pstate ring_pstate;
struct delayed_work autoenable_work;

/*
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 0c46f81..ac20dbf 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -7881,8 +7881,12 @@ static void intel_init_emon(struct drm_i915_private *dev_priv)

static inline void intel_update_ring_freq(struct drm_i915_private *i915)
{
- if (NEEDS_RING_FREQ_UPDATE(i915))
+ if (NEEDS_RING_FREQ_UPDATE(i915)) {
+ if (READ_ONCE(i915->pm.ring_pstate.configured))
+ return;
gen6_update_ring_freq(i915);
+ i915->pm.ring_pstate.configured = true;
+ }
}

void intel_init_gt_powersave(struct drm_i915_private *dev_priv)
@@ -7975,7 +7979,8 @@ void intel_suspend_gt_powersave(struct drm_i915_private *dev_priv)

void intel_sanitize_gt_powersave(struct drm_i915_private *dev_priv)
{
- dev_priv->pm.rps.enabled = true; /* force disabling */
+ dev_priv->pm.rps.enabled = true; /* force RPS disabling */
+ dev_priv->pm.rc6.enabled = true; /* force RC6 disabling */
intel_disable_gt_powersave(dev_priv);

gen6_reset_rps_interrupts(dev_priv);
@@ -7983,6 +7988,9 @@ void intel_sanitize_gt_powersave(struct drm_i915_private *dev_priv)

void intel_disable_rc6(struct drm_i915_private *dev_priv)
{
+ if (!READ_ONCE(dev_priv->pm.rc6.enabled))
+ return;
+
if (INTEL_GEN(dev_priv) >= 9)
gen9_disable_rc6(dev_priv);
else if (IS_CHERRYVIEW(dev_priv))
@@ -7991,10 +7999,15 @@ void intel_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->pm.rc6.enabled = false;
}

void intel_disable_rps(struct drm_i915_private *dev_priv)
{
+ if (!READ_ONCE(dev_priv->pm.rps.enabled))
+ return;
+
if (INTEL_GEN(dev_priv) >= 9)
gen9_disable_rps(dev_priv);
else if (IS_CHERRYVIEW(dev_priv))
@@ -8005,24 +8018,30 @@ void intel_disable_rps(struct drm_i915_private *dev_priv)
gen6_disable_rps(dev_priv);
else if (IS_IRONLAKE_M(dev_priv))
ironlake_disable_drps(dev_priv);
+
+ dev_priv->pm.rps.enabled = false;
}

void intel_disable_gt_powersave(struct drm_i915_private *dev_priv)
{
- if (!READ_ONCE(dev_priv->pm.rps.enabled))
- return;
-
mutex_lock(&dev_priv->pm.pcu_lock);

intel_disable_rc6(dev_priv);
intel_disable_rps(dev_priv);
+ if (NEEDS_RING_FREQ_UPDATE(dev_priv))
+ dev_priv->pm.ring_pstate.configured = false;

- dev_priv->pm.rps.enabled = false;
mutex_unlock(&dev_priv->pm.pcu_lock);
}

void intel_enable_rc6(struct drm_i915_private *dev_priv)
{
+ /* We shouldn't be disabling as we submit, so this should be less
+ * racy than it appears!
+ */
+ if (READ_ONCE(dev_priv->pm.rc6.enabled))
+ return;
+
if (IS_CHERRYVIEW(dev_priv))
cherryview_enable_rc6(dev_priv);
else if (IS_VALLEYVIEW(dev_priv))
@@ -8033,10 +8052,18 @@ void intel_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->pm.rc6.enabled = true;
}

void intel_enable_rps(struct drm_i915_private *dev_priv)
{
+ /* We shouldn't be disabling as we submit, so this should be less
+ * racy than it appears!
+ */
+ if (READ_ONCE(dev_priv->pm.rps.enabled))
+ return;
+
if (IS_CHERRYVIEW(dev_priv)) {
cherryview_enable_rps(dev_priv);
} else if (IS_VALLEYVIEW(dev_priv)) {
@@ -8057,16 +8084,12 @@ void intel_enable_rps(struct drm_i915_private *dev_priv)

WARN_ON(dev_priv->pm.rps.efficient_freq < dev_priv->pm.rps.min_freq);
WARN_ON(dev_priv->pm.rps.efficient_freq > dev_priv->pm.rps.max_freq);
+
+ dev_priv->pm.rps.enabled = true;
}

void intel_enable_gt_powersave(struct drm_i915_private *dev_priv)
{
- /* We shouldn't be disabling as we submit, so this should be less
- * racy than it appears!
- */
- if (READ_ONCE(dev_priv->pm.rps.enabled))
- return;
-
/* Powersaving is controlled by the host when inside a VM */
if (intel_vgpu_active(dev_priv))
return;
@@ -8077,7 +8100,6 @@ void intel_enable_gt_powersave(struct drm_i915_private *dev_priv)
intel_enable_rps(dev_priv);
intel_update_ring_freq(dev_priv);

- dev_priv->pm.rps.enabled = true;
mutex_unlock(&dev_priv->pm.pcu_lock);
}

@@ -8088,7 +8110,10 @@ static void __intel_autoenable_gt_powersave(struct work_struct *work)
struct intel_engine_cs *rcs;
struct drm_i915_gem_request *req;

- if (READ_ONCE(dev_priv->pm.rps.enabled))
+ if (READ_ONCE(dev_priv->pm.rps.enabled) &&
+ READ_ONCE(dev_priv->pm.rc6.enabled) &&
+ !(NEEDS_RING_FREQ_UPDATE(dev_priv) ^
+ READ_ONCE(dev_priv->pm.ring_pstate.configured)))
goto out;

rcs = dev_priv->engine[RCS];
@@ -8118,7 +8143,10 @@ static void __intel_autoenable_gt_powersave(struct work_struct *work)

void intel_autoenable_gt_powersave(struct drm_i915_private *dev_priv)
{
- if (READ_ONCE(dev_priv->pm.rps.enabled))
+ if (READ_ONCE(dev_priv->pm.rps.enabled) &&
+ READ_ONCE(dev_priv->pm.rc6.enabled) &&
+ !(NEEDS_RING_FREQ_UPDATE(dev_priv) ^
+ READ_ONCE(dev_priv->pm.ring_pstate.configured)))
return;

if (IS_IRONLAKE_M(dev_priv)) {