Skip to content

Commit

Permalink
drm/i915: Pass intel_plane to plane tracepoints
Browse files Browse the repository at this point in the history 
Pass intel_plane rather than drm_plane to the plane tracepoints.
Matches what we do eg. with the fbc tracepoints. Using the same
type for everything will help with digging out the device name
from the plane in the future.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221111123120.7759-2-ville.syrjala@linux.intel.com
Acked-by: Jani Nikula <jani.nikula@intel.com>
  • Loading branch information
Ville Syrjälä committed Nov 17, 2022
1 parent 6af0ffc commit b5423d1
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions drivers/gpu/drm/i915/display/intel_atomic_plane.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,7 @@ void intel_plane_update_noarm(struct intel_plane *plane,
{
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);

trace_intel_plane_update_noarm(&plane->base, crtc);
trace_intel_plane_update_noarm(plane, crtc);

if (plane->update_noarm)
plane->update_noarm(plane, crtc_state, plane_state);
Expand All @@ -769,7 +769,7 @@ void intel_plane_update_arm(struct intel_plane *plane,
{
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);

trace_intel_plane_update_arm(&plane->base, crtc);
trace_intel_plane_update_arm(plane, crtc);

if (crtc_state->do_async_flip && plane->async_flip)
plane->async_flip(plane, crtc_state, plane_state, true);
Expand All @@ -782,7 +782,7 @@ void intel_plane_disable_arm(struct intel_plane *plane,
{
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);

trace_intel_plane_disable_arm(&plane->base, crtc);
trace_intel_plane_disable_arm(plane, crtc);
plane->disable_arm(plane, crtc_state);
}

Expand Down
26 changes: 13 additions & 13 deletions drivers/gpu/drm/i915/display/intel_display_trace.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ TRACE_EVENT(vlv_fifo_size,
);

TRACE_EVENT(intel_plane_update_noarm,
TP_PROTO(struct drm_plane *plane, struct intel_crtc *crtc),
TP_PROTO(struct intel_plane *plane, struct intel_crtc *crtc),
TP_ARGS(plane, crtc),

TP_STRUCT__entry(
Expand All @@ -293,16 +293,16 @@ TRACE_EVENT(intel_plane_update_noarm,
__field(u32, scanline)
__array(int, src, 4)
__array(int, dst, 4)
__string(name, plane->name)
__string(name, plane->base.name)
),

TP_fast_assign(
__assign_str(name, plane->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);
memcpy(__entry->src, &plane->state->src, sizeof(__entry->src));
memcpy(__entry->dst, &plane->state->dst, sizeof(__entry->dst));
memcpy(__entry->src, &plane->base.state->src, sizeof(__entry->src));
memcpy(__entry->dst, &plane->base.state->dst, sizeof(__entry->dst));
),

TP_printk("pipe %c, plane %s, frame=%u, scanline=%u, " DRM_RECT_FP_FMT " -> " DRM_RECT_FMT,
Expand All @@ -313,7 +313,7 @@ TRACE_EVENT(intel_plane_update_noarm,
);

TRACE_EVENT(intel_plane_update_arm,
TP_PROTO(struct drm_plane *plane, struct intel_crtc *crtc),
TP_PROTO(struct intel_plane *plane, struct intel_crtc *crtc),
TP_ARGS(plane, crtc),

TP_STRUCT__entry(
Expand All @@ -322,16 +322,16 @@ TRACE_EVENT(intel_plane_update_arm,
__field(u32, scanline)
__array(int, src, 4)
__array(int, dst, 4)
__string(name, plane->name)
__string(name, plane->base.name)
),

TP_fast_assign(
__assign_str(name, plane->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);
memcpy(__entry->src, &plane->state->src, sizeof(__entry->src));
memcpy(__entry->dst, &plane->state->dst, sizeof(__entry->dst));
memcpy(__entry->src, &plane->base.state->src, sizeof(__entry->src));
memcpy(__entry->dst, &plane->base.state->dst, sizeof(__entry->dst));
),

TP_printk("pipe %c, plane %s, frame=%u, scanline=%u, " DRM_RECT_FP_FMT " -> " DRM_RECT_FMT,
Expand All @@ -342,18 +342,18 @@ TRACE_EVENT(intel_plane_update_arm,
);

TRACE_EVENT(intel_plane_disable_arm,
TP_PROTO(struct drm_plane *plane, struct intel_crtc *crtc),
TP_PROTO(struct intel_plane *plane, struct intel_crtc *crtc),
TP_ARGS(plane, crtc),

TP_STRUCT__entry(
__field(enum pipe, pipe)
__field(u32, frame)
__field(u32, scanline)
__string(name, plane->name)
__string(name, plane->base.name)
),

TP_fast_assign(
__assign_str(name, plane->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);
Expand Down

0 comments on commit b5423d1

Please sign in to comment.