[Intel-gfx] [PATCH] drm/i915/perf: Prefer using the pinned_ctx for emitting delays on config

[Lionel Landwerlin]

Makes sense, I was thinking about that yesterday.

Without the typo : Reviewed-by: Lionel Landwerlin 
<lionel.g.landwerlin at intel.com>

On 12/10/2019 12:08, Chris Wilson wrote:
> 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 at chris-wilson.co.uk>
> Cc: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
> ---
>   drivers/gpu/drm/i915/i915_perf.c | 9 +++++++--
>   1 file 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..959b6c341934 100644
> --- a/drivers/gpu/drm/i915/i915_perf.c
> +++ b/drivers/gpu/drm/i915/i915_perf.c
> @@ -1903,6 +1903,11 @@ static int emit_oa_config(struct i915_perf_stream *stream,
>   	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(streama));


Typo here s/streama/stream/


>   }
>   
>   static void gen8_disable_metric_set(struct i915_perf_stream *stream)