drm/i915: Add missing ; to __assign_str() macros in tracepoint code
authorSteven Rostedt (Google) <rostedt@goodmis.org>
Thu, 22 Feb 2024 18:30:57 +0000 (13:30 -0500)
committerSteven Rostedt (Google) <rostedt@goodmis.org>
Mon, 18 Mar 2024 14:24:25 +0000 (10:24 -0400)
I'm working on improving the __assign_str() and __string() macros to be
more efficient, and removed some unneeded semicolons. This triggered a bug
in the build as some of the __assign_str() macros in intel_display_trace
was missing a terminating semicolon.

Link: https://lore.kernel.org/linux-trace-kernel/20240222133057.2af72a19@gandalf.local.home
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: David Airlie <airlied@gmail.com>
Cc: stable@vger.kernel.org
Fixes: 2ceea5d88048b ("drm/i915: Print plane name in fbc tracepoints")
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
drivers/gpu/drm/i915/display/intel_display_trace.h

index 99bdb833591ce1a44e14ae1df964d7166cfcf9e0..7862e7cefe02785b828d0e5769c4b511913f67c9 100644 (file)
@@ -411,7 +411,7 @@ TRACE_EVENT(intel_fbc_activate,
                           struct intel_crtc *crtc = intel_crtc_for_pipe(to_i915(plane->base.dev),
                                                                         plane->pipe);
                           __assign_str(dev, __dev_name_kms(plane));
-                          __assign_str(name, plane->base.name)
+                          __assign_str(name, plane->base.name);
                           __entry->pipe = crtc->pipe;
                           __entry->frame = intel_crtc_get_vblank_counter(crtc);
                           __entry->scanline = intel_get_crtc_scanline(crtc);
@@ -438,7 +438,7 @@ TRACE_EVENT(intel_fbc_deactivate,
                           struct intel_crtc *crtc = intel_crtc_for_pipe(to_i915(plane->base.dev),
                                                                         plane->pipe);
                           __assign_str(dev, __dev_name_kms(plane));
-                          __assign_str(name, plane->base.name)
+                          __assign_str(name, plane->base.name);
                           __entry->pipe = crtc->pipe;
                           __entry->frame = intel_crtc_get_vblank_counter(crtc);
                           __entry->scanline = intel_get_crtc_scanline(crtc);
@@ -465,7 +465,7 @@ TRACE_EVENT(intel_fbc_nuke,
                           struct intel_crtc *crtc = intel_crtc_for_pipe(to_i915(plane->base.dev),
                                                                         plane->pipe);
                           __assign_str(dev, __dev_name_kms(plane));
-                          __assign_str(name, plane->base.name)
+                          __assign_str(name, plane->base.name);
                           __entry->pipe = crtc->pipe;
                           __entry->frame = intel_crtc_get_vblank_counter(crtc);
                           __entry->scanline = intel_get_crtc_scanline(crtc);