[PATCH 05/10] drm/i915: skip DRM_I915_LOW_LEVEL_TRACEPOINTS with NOTRACE

[Steven Rostedt]

On Fri,  5 Apr 2024 16:18:23 +0200
Sebastian Andrzej Siewior <bigeasy at linutronix.de> wrote:

> The order of the header files is important. If this header file is
> included after tracepoint.h was included then the NOTRACE here becomes a
> nop. Currently this happens for two .c files which use the tracepoitns
> behind DRM_I915_LOW_LEVEL_TRACEPOINTS.

The NOTRACE should not be included in the individual trace files.

Can you show where this is an issue. I think this is fixing the symptom
and not the bug itself.

-- Steve


> 
> Cc: Steven Rostedt <rostedt at goodmis.org>
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy at linutronix.de>
> Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
> ---
>  drivers/gpu/drm/i915/i915_trace.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
> index c54653cf72c95..3c51620d011b1 100644
> --- a/drivers/gpu/drm/i915/i915_trace.h
> +++ b/drivers/gpu/drm/i915/i915_trace.h
> @@ -326,7 +326,7 @@ DEFINE_EVENT(i915_request, i915_request_add,
>  	     TP_ARGS(rq)
>  );
>  
> -#if defined(CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS)
> +#if defined(CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS) && !defined(NOTRACE)
>  DEFINE_EVENT(i915_request, i915_request_guc_submit,
>  	     TP_PROTO(struct i915_request *rq),
>  	     TP_ARGS(rq)