drm/i915/perf: Prefer using the pinned_ctx for emitting delays on config (5f5c382e) · Commits · 戴 / test

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

drivers/gpu/drm/i915/i915_perf.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -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)

Admin message