drm/i915: Pass i915 to frontbuffer tracepoints

Pass the device to the frontbuffer tracpoints. Will be used
later to include the device name in the tracpoints.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221111123120.7759-4-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 096168ae8e2af1de7819636b242254e859581acc..7ba1c0c22a4bfb172f69cbd3c5794023d5949abc 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_trace.h
+++ b/drivers/gpu/drm/i915/display/intel_display_trace.h
@@ -553,8 +553,9 @@ TRACE_EVENT(intel_pipe_update_end,
 );
 
 TRACE_EVENT(intel_frontbuffer_invalidate,
-           TP_PROTO(unsigned int frontbuffer_bits, unsigned int origin),
-           TP_ARGS(frontbuffer_bits, origin),
+           TP_PROTO(struct drm_i915_private *i915,
+                    unsigned int frontbuffer_bits, unsigned int origin),
+           TP_ARGS(i915, frontbuffer_bits, origin),
 
            TP_STRUCT__entry(
                             __field(unsigned int, frontbuffer_bits)
@@ -571,8 +572,9 @@ TRACE_EVENT(intel_frontbuffer_invalidate,
 );
 
 TRACE_EVENT(intel_frontbuffer_flush,
-           TP_PROTO(unsigned int frontbuffer_bits, unsigned int origin),
-           TP_ARGS(frontbuffer_bits, origin),
+           TP_PROTO(struct drm_i915_private *i915,
+                    unsigned int frontbuffer_bits, unsigned int origin),
+           TP_ARGS(i915, frontbuffer_bits, origin),
 
            TP_STRUCT__entry(
                             __field(unsigned int, frontbuffer_bits)

diff --git a/drivers/gpu/drm/i915/display/intel_frontbuffer.c b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
index d80e3e8a9b01cde94993a4a9e62dd6923ea88635..17a7aa8b28c242ea2399b36d1155d24393043133 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_frontbuffer.c
+++ b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
@@ -88,7 +88,7 @@ static void frontbuffer_flush(struct drm_i915_private *i915,
        if (!frontbuffer_bits)
                return;
 
-       trace_intel_frontbuffer_flush(frontbuffer_bits, origin);
+       trace_intel_frontbuffer_flush(i915, frontbuffer_bits, origin);
 
        might_sleep();
        intel_drrs_flush(i915, frontbuffer_bits);
@@ -176,7 +176,7 @@ void __intel_fb_invalidate(struct intel_frontbuffer *front,
                spin_unlock(&i915->display.fb_tracking.lock);
        }
 
-       trace_intel_frontbuffer_invalidate(frontbuffer_bits, origin);
+       trace_intel_frontbuffer_invalidate(i915, frontbuffer_bits, origin);
 
        might_sleep();
        intel_psr_invalidate(i915, frontbuffer_bits, origin);