| Message ID | 20240222133057.2af72a19@gandalf.local.home (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0df4c388a1e310400a6e90fb10b286e2673756f0 |
| Headers | show |
| Series | drm/i915: Add missing ; to __assign_str() macros in tracepoint code | expand |
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
On Thu, 22 Feb 2024 13:30:57 -0500 Steven Rostedt <rostedt@goodmis.org> 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> > --- Note, I have patches that depend on this fix, so if one of the maintainers would like to just give me an "Acked-by", I'll take it through my tree. I doubt it will have any conflicts, unless you are planning on changing the given effected events. -- Steve
On Thu, 22 Feb 2024 20:42:59 +0200 Ville Syrjälä <ville.syrjala@linux.intel.com> wrote: > 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. Thanks. I would like to add it to my tree as my changes rely on it. But I think to do that, I still need an Acked-by from one of the maintainers listed in the MAINTAINERS file. -- Steve
On Thu, Feb 22, 2024 at 01:43:49PM -0500, Steven Rostedt wrote: > On Thu, 22 Feb 2024 13:30:57 -0500 > Steven Rostedt <rostedt@goodmis.org> 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> > > --- > > Note, I have patches that depend on this fix, so if one of the maintainers > would like to just give me an "Acked-by", I'll take it through my tree. I > doubt it will have any conflicts, unless you are planning on changing the > given effected events. since it is not breaking builds on our side and the conflicts, if any, would be minimal, feel free to take this trough your tree Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > > -- Steve
On Thu, 22 Feb 2024 14:04:20 -0500 Rodrigo Vivi <rodrigo.vivi@intel.com> wrote: > > Note, I have patches that depend on this fix, so if one of the maintainers > > would like to just give me an "Acked-by", I'll take it through my tree. I > > doubt it will have any conflicts, unless you are planning on changing the > > given effected events. > > since it is not breaking builds on our side and the conflicts, if any, would > be minimal, feel free to take this trough your tree > > Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Thanks, much appreciated! -- Steve
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);