Skip to content

Commit 1d74ccb

Browse files
committed
drm/i915: Give i915 and xe each their own display tracepoints
jira LE-4018 Rebuild_History Non-Buildable kernel-5.14.0-570.37.1.el9_6 commit-author Ville Syrjälä <ville.syrjala@linux.intel.com> commit 8305d47 Currently we just define the display tracepoints with TRACE_SYSTEM i915. However the code gets included separately in i915 and xe, and now both modules are competing for the same tracepoints. 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 tracepoints so that things work even when both modules are loaded. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20250127213055.640-1-ville.syrjala@linux.intel.com Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com> (cherry picked from commit 8305d47) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent f40dcff commit 1d74ccb

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

drivers/gpu/drm/i915/display/intel_display_trace.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
*/
55

66
#undef TRACE_SYSTEM
7+
#ifdef I915
78
#define TRACE_SYSTEM i915
9+
#else
10+
#define TRACE_SYSTEM xe
11+
#endif
812

913
#if !defined(__INTEL_DISPLAY_TRACE_H__) || defined(TRACE_HEADER_MULTI_READ)
1014
#define __INTEL_DISPLAY_TRACE_H__

0 commit comments

Comments
 (0)