leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915/pmu: Convert engine sampling to uncore mmio

Browse Source 
Drops one macro using implicit dev_priv.

v2:
 * Use ENGINE_READ_FW. (Chris)

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190801162330.2729-2-tvrtko.ursulin@linux.intel.com
This commit is contained in:
Tvrtko Ursulin 2019-08-01 17:23:28 +01:00 committed by Chris Wilson
parent 908091c850
commit 28fba0961d
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,29 +162,30 @@ add_sample(struct i915_pmu_sample *sample, u32 val)
} }
static void static void
engines_sample(struct drm_i915_private *dev_priv, unsigned int period_ns) engines_sample(struct drm_i915_private *i915, unsigned int period_ns)
{ {
struct intel_uncore *uncore = &i915->uncore;
struct intel_engine_cs *engine; struct intel_engine_cs *engine;
enum intel_engine_id id; enum intel_engine_id id;
intel_wakeref_t wakeref; intel_wakeref_t wakeref;
unsigned long flags; unsigned long flags;
if ((dev_priv->pmu.enable & ENGINE_SAMPLE_MASK) == 0) if ((i915->pmu.enable & ENGINE_SAMPLE_MASK) == 0)
return; return;
wakeref = 0; wakeref = 0;
if (READ_ONCE(dev_priv->gt.awake)) if (READ_ONCE(i915->gt.awake))
wakeref = intel_runtime_pm_get_if_in_use(&dev_priv->runtime_pm); wakeref = intel_runtime_pm_get_if_in_use(&i915->runtime_pm);
if (!wakeref) if (!wakeref)
return; return;
spin_lock_irqsave(&dev_priv->uncore.lock, flags); spin_lock_irqsave(&uncore->lock, flags);
for_each_engine(engine, dev_priv, id) { for_each_engine(engine, i915, id) {
struct intel_engine_pmu *pmu = &engine->pmu; struct intel_engine_pmu *pmu = &engine->pmu;
bool busy; bool busy;
u32 val; u32 val;
val = I915_READ_FW(RING_CTL(engine->mmio_base)); val = ENGINE_READ_FW(engine, RING_CTL);
if (val == 0) /* powerwell off => engine idle */ if (val == 0) /* powerwell off => engine idle */
continue; continue;
@ -202,15 +203,15 @@ engines_sample(struct drm_i915_private *dev_priv, unsigned int period_ns)
*/ */
busy = val & (RING_WAIT_SEMAPHORE | RING_WAIT); busy = val & (RING_WAIT_SEMAPHORE | RING_WAIT);
if (!busy) { if (!busy) {
val = I915_READ_FW(RING_MI_MODE(engine->mmio_base)); val = ENGINE_READ_FW(engine, RING_MI_MODE);
busy = !(val & MODE_IDLE); busy = !(val & MODE_IDLE);
} }
if (busy) if (busy)
add_sample(&pmu->sample[I915_SAMPLE_BUSY], period_ns); add_sample(&pmu->sample[I915_SAMPLE_BUSY], period_ns);
} }
spin_unlock_irqrestore(&dev_priv->uncore.lock, flags); spin_unlock_irqrestore(&uncore->lock, flags);
intel_runtime_pm_put(&dev_priv->runtime_pm, wakeref); intel_runtime_pm_put(&i915->runtime_pm, wakeref);
} }
static void static void