diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-10-12 10:10:56 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-10-12 17:04:08 +0100 |
| commit | 5f5c382ecfdd06e17316d1c9f1362522c20cdfef (patch) | |
| tree | 7f8fe372b6ac4aeff65ebf739b16cd56a9d08aa8 /drivers/gpu/drm/i915/i915_perf.c | |
| parent | 15d0ace1f876e01b9745cb22ee32e3770fe3a6d5 (diff) | |
| download | linux-stable-5f5c382ecfdd06e17316d1c9f1362522c20cdfef.tar.gz linux-stable-5f5c382ecfdd06e17316d1c9f1362522c20cdfef.tar.bz2 linux-stable-5f5c382ecfdd06e17316d1c9f1362522c20cdfef.zip | |
drm/i915/perf: Prefer using the pinned_ctx for emitting delays on config
When we are watching a particular context, we want the OA config to be
applied inline with that context such that it takes effect before the
next submission.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191012091056.28686-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_perf.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_perf.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c index 74f50120c151..b4e2332d35cb 100644 --- a/drivers/gpu/drm/i915/i915_perf.c +++ b/drivers/gpu/drm/i915/i915_perf.c @@ -1903,6 +1903,11 @@ err_vma_put: return err; } +static struct intel_context *oa_context(struct i915_perf_stream *stream) +{ + return stream->pinned_ctx ?: stream->engine->kernel_context; +} + static int hsw_enable_metric_set(struct i915_perf_stream *stream) { struct intel_uncore *uncore = stream->uncore; @@ -1922,7 +1927,7 @@ static int hsw_enable_metric_set(struct i915_perf_stream *stream) intel_uncore_rmw(uncore, GEN6_UCGCTL1, 0, GEN6_CSUNIT_CLOCK_GATE_DISABLE); - return emit_oa_config(stream, stream->engine->kernel_context); + return emit_oa_config(stream, oa_context(stream)); } static void hsw_disable_metric_set(struct i915_perf_stream *stream) @@ -2286,7 +2291,7 @@ static int gen8_enable_metric_set(struct i915_perf_stream *stream) if (ret) return ret; - return emit_oa_config(stream, stream->engine->kernel_context); + return emit_oa_config(stream, oa_context(stream)); } static void gen8_disable_metric_set(struct i915_perf_stream *stream) |