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

drm/i915: Show support for accurate sw PMU busyness tracking

Browse Source 
Expose whether or not we support the PMU software tracking in our
scheduler capabilities, so userspace can query at runtime.

v2: Use I915_SCHEDULER_CAP_ENGINE_BUSY_STATS for a less ambiguous
capability name.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190703143702.11339-1-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2019-07-03 15:37:02 +01:00
parent 0c159ffef6
commit bf73fc0fa9
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/i915/gt/intel_engine_cs.c
View File

@ -688,9 +688,10 @@ void intel_engines_set_scheduler_caps(struct drm_i915_private *i915)
u8 engine; u8 engine;
u8 sched; u8 sched;
} map[] = { } map[] = {
#define MAP(x, y) { ilog2(I915_ENGINE_HAS_##x), ilog2(I915_SCHEDULER_CAP_##y) } #define MAP(x, y) { ilog2(I915_ENGINE_##x), ilog2(I915_SCHEDULER_CAP_##y) }
MAP(PREEMPTION, PREEMPTION), MAP(HAS_PREEMPTION, PREEMPTION),
MAP(SEMAPHORES, SEMAPHORES), MAP(HAS_SEMAPHORES, SEMAPHORES),
MAP(SUPPORTS_STATS, ENGINE_BUSY_STATS),
#undef MAP #undef MAP
}; };
struct intel_engine_cs *engine; struct intel_engine_cs *engine;

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

@ -102,10 +102,8 @@ static bool pmu_needs_timer(struct drm_i915_private *i915, bool gpu_active)
/* /*
* Also there is software busyness tracking available we do not * Also there is software busyness tracking available we do not
* need the timer for I915_SAMPLE_BUSY counter. * need the timer for I915_SAMPLE_BUSY counter.
*
* Use RCS as proxy for all engines.
*/ */
else if (intel_engine_supports_stats(i915->engine[RCS0])) else if (i915->caps.scheduler & I915_SCHEDULER_CAP_ENGINE_BUSY_STATS)
enable &= ~BIT(I915_SAMPLE_BUSY); enable &= ~BIT(I915_SAMPLE_BUSY);
/* /*

1
include/uapi/drm/i915_drm.h
View File

@ -521,6 +521,7 @@ typedef struct drm_i915_irq_wait {
#define I915_SCHEDULER_CAP_PRIORITY (1ul << 1) #define I915_SCHEDULER_CAP_PRIORITY (1ul << 1)
#define I915_SCHEDULER_CAP_PREEMPTION (1ul << 2) #define I915_SCHEDULER_CAP_PREEMPTION (1ul << 2)
#define I915_SCHEDULER_CAP_SEMAPHORES (1ul << 3) #define I915_SCHEDULER_CAP_SEMAPHORES (1ul << 3)
#define I915_SCHEDULER_CAP_ENGINE_BUSY_STATS (1ul << 4)
#define I915_PARAM_HUC_STATUS 42 #define I915_PARAM_HUC_STATUS 42