Re: [PATCH] drm/i915: Add missing ; to __assign_str() macros in tracepoint code

Ville Syrjälä
2024-02-22T18:43:03Z

On Thu, Feb 22, 2024 at 01:30:57PM -0500, Steven Rostedt wrote:
> From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
>
> 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.
>
> Fixes: 2ceea5d88048b ("drm/i915: Print plane name in fbc tracepoints")
> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Do you want me to apply this to drm-intel or do you want to take
it through some other tree? Either way seems fine for this stuff.

> ---
> drivers/gpu/drm/i915/display/intel_display_trace.h | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_trace.h b/drivers/gpu/drm/i915/display/intel_display_trace.h
> index 99bdb833591c..7862e7cefe02 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_trace.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_trace.h
> @@ -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);
> --
> 2.43.0

--
Ville Syrjälä
Intel