UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915/pmu: Track rpm wakeref 

Track the wakeref used for temporary access to the device, and discard
it upon release so that leaks can be identified.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190114142129.24398-8-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2019-01-14 14:21:16 +00:00
parent 6619c0075f
commit 00e27cbe4c
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/gpu/drm/i915/i915_pmu.c
View File

@ -167,6 +167,7 @@ engines_sample(struct drm_i915_private *dev_priv, unsigned int period_ns)
{ {
struct intel_engine_cs *engine; struct intel_engine_cs *engine;
enum intel_engine_id id; enum intel_engine_id id;
intel_wakeref_t wakeref;
bool fw = false; bool fw = false;
if ((dev_priv->pmu.enable & ENGINE_SAMPLE_MASK) == 0) if ((dev_priv->pmu.enable & ENGINE_SAMPLE_MASK) == 0)
@ -175,7 +176,8 @@ engines_sample(struct drm_i915_private *dev_priv, unsigned int period_ns)
if (!dev_priv->gt.awake) if (!dev_priv->gt.awake)
return; return;
if (!intel_runtime_pm_get_if_in_use(dev_priv)) wakeref = intel_runtime_pm_get_if_in_use(dev_priv);
if (!wakeref)
return; return;
for_each_engine(engine, dev_priv, id) { for_each_engine(engine, dev_priv, id) {
@ -210,7 +212,7 @@ engines_sample(struct drm_i915_private *dev_priv, unsigned int period_ns)
if (fw) if (fw)
intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL); intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
intel_runtime_pm_put_unchecked(dev_priv); intel_runtime_pm_put(dev_priv, wakeref);
} }
static void static void
@ -227,11 +229,15 @@ frequency_sample(struct drm_i915_private *dev_priv, unsigned int period_ns)
u32 val; u32 val;
val = dev_priv->gt_pm.rps.cur_freq; val = dev_priv->gt_pm.rps.cur_freq;
if (dev_priv->gt.awake && if (dev_priv->gt.awake) {
intel_runtime_pm_get_if_in_use(dev_priv)) { intel_wakeref_t wakeref =
val = intel_get_cagf(dev_priv, intel_runtime_pm_get_if_in_use(dev_priv);
I915_READ_NOTRACE(GEN6_RPSTAT1));
intel_runtime_pm_put_unchecked(dev_priv); if (wakeref) {
val = intel_get_cagf(dev_priv,
I915_READ_NOTRACE(GEN6_RPSTAT1));
intel_runtime_pm_put(dev_priv, wakeref);
}
} }
add_sample_mult(&dev_priv->pmu.sample[__I915_SAMPLE_FREQ_ACT], add_sample_mult(&dev_priv->pmu.sample[__I915_SAMPLE_FREQ_ACT],
@ -443,12 +449,14 @@ static u64 __get_rc6(struct drm_i915_private *i915)
static u64 get_rc6(struct drm_i915_private *i915) static u64 get_rc6(struct drm_i915_private *i915)
{ {
#if IS_ENABLED(CONFIG_PM) #if IS_ENABLED(CONFIG_PM)
intel_wakeref_t wakeref;
unsigned long flags; unsigned long flags;
u64 val; u64 val;
if (intel_runtime_pm_get_if_in_use(i915)) { wakeref = intel_runtime_pm_get_if_in_use(i915);
if (wakeref) {
val = __get_rc6(i915); val = __get_rc6(i915);
intel_runtime_pm_put_unchecked(i915); intel_runtime_pm_put(i915, wakeref);
/* /*
* If we are coming back from being runtime suspended we must * If we are coming back from being runtime suspended we must