mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-13 12:59:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915/scaler: Add scaler tracepoints

Browse Source 
Add some tracpoints around skl+ scaler programming to help with
debugging.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241219130827.22830-9-ville.syrjala@linux.intel.com
Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
This commit is contained in:
Ville Syrjälä
2024-12-19 15:08:27 +02:00
parent 49b14a1256
commit c0eac88092
2 changed files with 107 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
drivers/gpu/drm/i915/display/intel_display_trace.h
View File

@@ -489,6 +489,105 @@ TRACE_EVENT(intel_plane_disable_arm,
__entry->frame, __entry->scanline)
);
TRACE_EVENT(intel_plane_scaler_update_arm,
TP_PROTO(struct intel_plane *plane,
int scaler_id, int x, int y, int w, int h),
TP_ARGS(plane, scaler_id, x, y, w, h),
TP_STRUCT__entry(
__string(dev, __dev_name_kms(plane))
__field(char, pipe_name)
__field(int, scaler_id)
__field(u32, frame)
__field(u32, scanline)
__field(int, x)
__field(int, y)
__field(int, w)
__field(int, h)
__string(name, plane->base.name)
),
TP_fast_assign(
struct intel_display *display = to_intel_display(plane);
struct intel_crtc *crtc = intel_crtc_for_pipe(display, plane->pipe);
__assign_str(dev);
__assign_str(name);
__entry->pipe_name = pipe_name(crtc->pipe);
__entry->scaler_id = scaler_id;
__entry->frame = intel_crtc_get_vblank_counter(crtc);
__entry->scanline = intel_get_crtc_scanline(crtc);
__entry->x = x;
__entry->y = y;
__entry->w = w;
__entry->h = h;
),
TP_printk("dev %s, pipe %c, scaler %d, plane %s, frame=%u, scanline=%u, " DRM_RECT_FMT,
__get_str(dev), __entry->pipe_name, __entry->scaler_id,
__get_str(name), __entry->frame, __entry->scanline,
__entry->w, __entry->h, __entry->x, __entry->y)
);
TRACE_EVENT(intel_pipe_scaler_update_arm,
TP_PROTO(struct intel_crtc *crtc, int scaler_id,
int x, int y, int w, int h),
TP_ARGS(crtc, scaler_id, x, y, w, h),
TP_STRUCT__entry(
__string(dev, __dev_name_kms(crtc))
__field(char, pipe_name)
__field(int, scaler_id)
__field(u32, frame)
__field(u32, scanline)
__field(int, x)
__field(int, y)
__field(int, w)
__field(int, h)
),
TP_fast_assign(
__assign_str(dev);
__entry->pipe_name = pipe_name(crtc->pipe);
__entry->scaler_id = scaler_id;
__entry->frame = intel_crtc_get_vblank_counter(crtc);
__entry->scanline = intel_get_crtc_scanline(crtc);
__entry->x = x;
__entry->y = y;
__entry->w = w;
__entry->h = h;
),
TP_printk("dev %s, pipe %c, scaler %d frame=%u, scanline=%u, " DRM_RECT_FMT,
__get_str(dev), __entry->pipe_name, __entry->scaler_id,
__entry->frame, __entry->scanline,
__entry->w, __entry->h, __entry->x, __entry->y)
);
TRACE_EVENT(intel_scaler_disable_arm,
TP_PROTO(struct intel_crtc *crtc, int scaler_id),
TP_ARGS(crtc, scaler_id),
TP_STRUCT__entry(
__string(dev, __dev_name_kms(crtc))
__field(char, pipe_name)
__field(int, scaler_id)
__field(u32, frame)
__field(u32, scanline)
),
TP_fast_assign(
__assign_str(dev);
__entry->pipe_name = pipe_name(crtc->pipe);
__entry->scaler_id = scaler_id;
__entry->frame = intel_crtc_get_vblank_counter(crtc);
__entry->scanline = intel_get_crtc_scanline(crtc);
),
TP_printk("dev %s, pipe %c, scaler %d, frame=%u, scanline=%u",
__get_str(dev), __entry->pipe_name, __entry->scaler_id,
__entry->frame, __entry->scanline)
);
TRACE_EVENT(intel_fbc_activate,
TP_PROTO(struct intel_plane *plane),
TP_ARGS(plane),

8
drivers/gpu/drm/i915/display/skl_scaler.c
View File

@@ -6,6 +6,7 @@
#include "i915_drv.h"
#include "i915_reg.h"
#include "intel_de.h"
#include "intel_display_trace.h"
#include "intel_display_types.h"
#include "intel_fb.h"
#include "skl_scaler.h"
@@ -706,6 +707,8 @@ void skl_pfit_enable(const struct intel_crtc_state *crtc_state)
ps_ctrl = PS_SCALER_EN | PS_BINDING_PIPE | scaler_state->scalers[id].mode |
skl_scaler_get_filter_select(crtc_state->hw.scaling_filter, 0);
trace_intel_pipe_scaler_update_arm(crtc, id, x, y, width, height);
skl_scaler_setup_filter(display, pipe, id, 0,
crtc_state->hw.scaling_filter);
@@ -770,6 +773,9 @@ skl_program_plane_scaler(struct intel_plane *plane,
ps_ctrl = PS_SCALER_EN | PS_BINDING_PLANE(plane->id) | scaler->mode |
skl_scaler_get_filter_select(plane_state->hw.scaling_filter, 0);
trace_intel_plane_scaler_update_arm(plane, scaler_id,
crtc_x, crtc_y, crtc_w, crtc_h);
skl_scaler_setup_filter(display, pipe, scaler_id, 0,
plane_state->hw.scaling_filter);
@@ -788,6 +794,8 @@ static void skl_detach_scaler(struct intel_crtc *crtc, int id)
{
struct intel_display *display = to_intel_display(crtc);
trace_intel_scaler_disable_arm(crtc, id);
intel_de_write_fw(display, SKL_PS_CTRL(crtc->pipe, id), 0);
intel_de_write_fw(display, SKL_PS_WIN_POS(crtc->pipe, id), 0);
intel_de_write_fw(display, SKL_PS_WIN_SZ(crtc->pipe, id), 0);