drm/i915: Print plane name in fbc tracepoints

Print the name of the plane in the fbc tracepoints. As the
pipe<->plane assignment can vary on old hw it's probably
more helpful to see both the plane and the pipe names together.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221111123120.7759-3-ville.syrjala@linux.intel.com
Acked-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display_trace.h b/drivers/gpu/drm/i915/display/intel_display_trace.h
index 1a3955bcb77f95c13b4d3e3232a0bdcd61cef5f6..096168ae8e2af1de7819636b242254e859581acc 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_trace.h
+++ b/drivers/gpu/drm/i915/display/intel_display_trace.h
@@ -369,6 +369,7 @@ TRACE_EVENT(intel_fbc_activate,
            TP_ARGS(plane),
 
            TP_STRUCT__entry(
+                            __string(name, plane->base.name)
                             __field(enum pipe, pipe)
                             __field(u32, frame)
                             __field(u32, scanline)
@@ -377,13 +378,15 @@ TRACE_EVENT(intel_fbc_activate,
            TP_fast_assign(
                           struct intel_crtc *crtc = intel_crtc_for_pipe(to_i915(plane->base.dev),
                                                                         plane->pipe);
+                          __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);
                           ),
 
-           TP_printk("pipe %c, frame=%u, scanline=%u",
-                     pipe_name(__entry->pipe), __entry->frame, __entry->scanline)
+           TP_printk("pipe %c, plane %s, frame=%u, scanline=%u",
+                     pipe_name(__entry->pipe), __get_str(name),
+                     __entry->frame, __entry->scanline)
 );
 
 TRACE_EVENT(intel_fbc_deactivate,
@@ -391,6 +394,7 @@ TRACE_EVENT(intel_fbc_deactivate,
            TP_ARGS(plane),
 
            TP_STRUCT__entry(
+                            __string(name, plane->base.name)
                             __field(enum pipe, pipe)
                             __field(u32, frame)
                             __field(u32, scanline)
@@ -399,13 +403,15 @@ TRACE_EVENT(intel_fbc_deactivate,
            TP_fast_assign(
                           struct intel_crtc *crtc = intel_crtc_for_pipe(to_i915(plane->base.dev),
                                                                         plane->pipe);
+                          __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);
                           ),
 
-           TP_printk("pipe %c, frame=%u, scanline=%u",
-                     pipe_name(__entry->pipe), __entry->frame, __entry->scanline)
+           TP_printk("pipe %c, plane %s, frame=%u, scanline=%u",
+                     pipe_name(__entry->pipe), __get_str(name),
+                     __entry->frame, __entry->scanline)
 );
 
 TRACE_EVENT(intel_fbc_nuke,
@@ -413,6 +419,7 @@ TRACE_EVENT(intel_fbc_nuke,
            TP_ARGS(plane),
 
            TP_STRUCT__entry(
+                            __string(name, plane->base.name)
                             __field(enum pipe, pipe)
                             __field(u32, frame)
                             __field(u32, scanline)
@@ -421,13 +428,15 @@ TRACE_EVENT(intel_fbc_nuke,
            TP_fast_assign(
                           struct intel_crtc *crtc = intel_crtc_for_pipe(to_i915(plane->base.dev),
                                                                         plane->pipe);
+                          __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);
                           ),
 
-           TP_printk("pipe %c, frame=%u, scanline=%u",
-                     pipe_name(__entry->pipe), __entry->frame, __entry->scanline)
+           TP_printk("pipe %c, plane %s, frame=%u, scanline=%u",
+                     pipe_name(__entry->pipe), __get_str(name),
+                     __entry->frame, __entry->scanline)
 );
 
 TRACE_EVENT(intel_crtc_vblank_work_start,