Commit 0df4c388 authored by Steven Rostedt (Google)'s avatar Steven Rostedt (Google)
Browse files

drm/i915: Add missing ; to __assign_str() macros in tracepoint code 

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: 2ceea5d8 ("drm/i915: Print plane name in fbc tracepoints")
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 9388a2aa

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

+3 −3
Original line number Diff line number Diff line
@@ -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);