[PATCH] drm/i915: Give i915 and xe each their own display tracepoints

[Cavitt, Jonathan]

-----Original Message-----
From: Intel-xe <intel-xe-bounces at lists.freedesktop.org> On Behalf Of Ville Syrjala
Sent: Monday, January 27, 2025 1:31 PM
To: intel-gfx at lists.freedesktop.org
Cc: intel-xe at lists.freedesktop.org
Subject: [PATCH] drm/i915: Give i915 and xe each their own display tracepoints
> 
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> Currently we just define the display tracpoints with
> TRACE_SYSTEM i915. However the code gets included separately
> in i915 and xe, and now both modules are competing for the
> same tracpoints. Apparently whichever module is loaded first
> gets the tracepoints and the other guy is left with nothing.
> 
> Give each module its own set of display tracpoints so that
> things work even when both modules are loaded.
> 
> This one had me stumped for a bit when after a reboot I lost
> all i915 display tracpoints (on account of the new kernel
> also including xe, and something also ended up loading it
> before I manually loaded i915).

s/tracpoints/tracepoints

Also, the last sentence in this commit message probably isn't
necessary, but it doesn't detract from anything, so I won't block
on its removal.  Just fix the tracepoints spelling and this is:
Reviewed-by: Jonathan Cavitt <jonathan.cavitt at intel.com>

Though it would probably be good to file an issue report detailing
the issue this fixes, then mark this patch as having fixed that
reported issue.
-Jonathan Cavitt

> 
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display_trace.h | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_trace.h b/drivers/gpu/drm/i915/display/intel_display_trace.h
> index 54a6e2a46b82..0e10c2856058 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_trace.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_trace.h
> @@ -4,7 +4,11 @@
>   */
>  
>  #undef TRACE_SYSTEM
> +#ifdef I915
>  #define TRACE_SYSTEM i915
> +#else
> +#define TRACE_SYSTEM xe
> +#endif
>  
>  #if !defined(__INTEL_DISPLAY_TRACE_H__) || defined(TRACE_HEADER_MULTI_READ)
>  #define __INTEL_DISPLAY_TRACE_H__
> -- 
> 2.45.3
> 
>