* [PATCH 00/13] drm/dp, drm/i915: conversions from seq_file to drm_printer
@ 2026-10-30 12:03 Jani Nikula
2026-10-30 12:03 ` [PATCH 01/13] drm/dp: pass struct drm_printer to drm_dp_downstream_debug() Jani Nikula
` (12 more replies)
0 siblings, 13 replies; 15+ messages in thread
From: Jani Nikula @ 2026-10-30 12:03 UTC (permalink / raw)
To: dri-devel, intel-gfx, intel-xe; +Cc: jani.nikula
I've had this in a branch since at least April, seems useful.
Jani Nikula (13):
drm/dp: pass struct drm_printer to drm_dp_downstream_debug()
drm/dp: prefer drm_printf_indent() over inline \t
drm/i915/debugfs: pass struct drm_printer to intel_plane_info()
drm/i915/debugfs: pass struct drm_printer to crtc_updates_info()
drm/i915/debugfs: convert crtc_updates_info() to use
drm_printf_indent()
drm/i915/debugfs: pass struct drm_printer to intel_scaler_info()
drm/i915/debugfs: pass struct drm_printer to intel_encoder_info()
drm/i915/debugfs: pass struct drm_printer to intel_crtc_info()
drm/i915/debugfs: pass struct drm_printer to
intel_{dp,dp_mst,hdmi}_crtc_info()
drm/i915/debugfs: pass struct drm_printer to intel_hdcp_info()
drm/i915/debugfs: refactor intel_seq_print_mode() into
intel_print_mode()
drm/i915/debugfs: pass struct drm_printer to intel_connector_info()
drm/i915/debugfs: prefer drm_printf_indent() over inline \t
drivers/gpu/drm/display/drm_dp_helper.c | 39 ++-
.../drm/i915/display/intel_display_debugfs.c | 250 +++++++++---------
drivers/gpu/drm/i915/display/intel_hdcp.c | 27 +-
drivers/gpu/drm/i915/display/intel_hdcp.h | 4 +-
include/drm/display/drm_dp_helper.h | 3 +-
5 files changed, 160 insertions(+), 163 deletions(-)
base-commit: 29f9258a2788a1066c0910c480e65c80887f4d20
--
2.47.3
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 01/13] drm/dp: pass struct drm_printer to drm_dp_downstream_debug()
2026-10-30 12:03 [PATCH 00/13] drm/dp, drm/i915: conversions from seq_file to drm_printer Jani Nikula
@ 2026-10-30 12:03 ` Jani Nikula
2026-10-30 12:03 ` [PATCH 02/13] drm/dp: prefer drm_printf_indent() over inline \t Jani Nikula
` (11 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2026-10-30 12:03 UTC (permalink / raw)
To: dri-devel, intel-gfx, intel-xe; +Cc: jani.nikula
struct drm_printer is more versatile than struct seq_file, and allows
the use of drm_printer helpers. Switch to it.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/display/drm_dp_helper.c | 36 +++++++++----------
.../drm/i915/display/intel_display_debugfs.c | 3 +-
include/drm/display/drm_dp_helper.h | 3 +-
3 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/drivers/gpu/drm/display/drm_dp_helper.c b/drivers/gpu/drm/display/drm_dp_helper.c
index 488fd123a01a..166a77091abe 100644
--- a/drivers/gpu/drm/display/drm_dp_helper.c
+++ b/drivers/gpu/drm/display/drm_dp_helper.c
@@ -1660,14 +1660,14 @@ EXPORT_SYMBOL(drm_dp_downstream_id);
/**
* drm_dp_downstream_debug() - debug DP branch devices
- * @m: pointer for debugfs file
+ * @p: pointer to drm printer
* @dpcd: DisplayPort configuration data
* @port_cap: port capabilities
* @drm_edid: EDID
* @aux: DisplayPort AUX channel
*
*/
-void drm_dp_downstream_debug(struct seq_file *m,
+void drm_dp_downstream_debug(struct drm_printer *p,
const u8 dpcd[DP_RECEIVER_CAP_SIZE],
const u8 port_cap[4],
const struct drm_edid *drm_edid,
@@ -1683,7 +1683,7 @@ void drm_dp_downstream_debug(struct seq_file *m,
int type = port_cap[0] & DP_DS_PORT_TYPE_MASK;
bool branch_device = drm_dp_is_branch(dpcd);
- seq_printf(m, "\tDP branch device present: %s\n",
+ drm_printf(p, "\tDP branch device present: %s\n",
str_yes_no(branch_device));
if (!branch_device)
@@ -1691,60 +1691,60 @@ void drm_dp_downstream_debug(struct seq_file *m,
switch (type) {
case DP_DS_PORT_TYPE_DP:
- seq_puts(m, "\t\tType: DisplayPort\n");
+ drm_puts(p, "\t\tType: DisplayPort\n");
break;
case DP_DS_PORT_TYPE_VGA:
- seq_puts(m, "\t\tType: VGA\n");
+ drm_puts(p, "\t\tType: VGA\n");
break;
case DP_DS_PORT_TYPE_DVI:
- seq_puts(m, "\t\tType: DVI\n");
+ drm_puts(p, "\t\tType: DVI\n");
break;
case DP_DS_PORT_TYPE_HDMI:
- seq_puts(m, "\t\tType: HDMI\n");
+ drm_puts(p, "\t\tType: HDMI\n");
break;
case DP_DS_PORT_TYPE_NON_EDID:
- seq_puts(m, "\t\tType: others without EDID support\n");
+ drm_puts(p, "\t\tType: others without EDID support\n");
break;
case DP_DS_PORT_TYPE_DP_DUALMODE:
- seq_puts(m, "\t\tType: DP++\n");
+ drm_puts(p, "\t\tType: DP++\n");
break;
case DP_DS_PORT_TYPE_WIRELESS:
- seq_puts(m, "\t\tType: Wireless\n");
+ drm_puts(p, "\t\tType: Wireless\n");
break;
default:
- seq_puts(m, "\t\tType: N/A\n");
+ drm_puts(p, "\t\tType: N/A\n");
}
memset(id, 0, sizeof(id));
drm_dp_downstream_id(aux, id);
- seq_printf(m, "\t\tID: %s\n", id);
+ drm_printf(p, "\t\tID: %s\n", id);
len = drm_dp_dpcd_read_data(aux, DP_BRANCH_HW_REV, &rev[0], 1);
if (!len)
- seq_printf(m, "\t\tHW: %d.%d\n",
+ drm_printf(p, "\t\tHW: %d.%d\n",
(rev[0] & 0xf0) >> 4, rev[0] & 0xf);
len = drm_dp_dpcd_read_data(aux, DP_BRANCH_SW_REV, rev, 2);
if (!len)
- seq_printf(m, "\t\tSW: %d.%d\n", rev[0], rev[1]);
+ drm_printf(p, "\t\tSW: %d.%d\n", rev[0], rev[1]);
if (detailed_cap_info) {
clk = drm_dp_downstream_max_dotclock(dpcd, port_cap);
if (clk > 0)
- seq_printf(m, "\t\tMax dot clock: %d kHz\n", clk);
+ drm_printf(p, "\t\tMax dot clock: %d kHz\n", clk);
clk = drm_dp_downstream_max_tmds_clock(dpcd, port_cap, drm_edid);
if (clk > 0)
- seq_printf(m, "\t\tMax TMDS clock: %d kHz\n", clk);
+ drm_printf(p, "\t\tMax TMDS clock: %d kHz\n", clk);
clk = drm_dp_downstream_min_tmds_clock(dpcd, port_cap, drm_edid);
if (clk > 0)
- seq_printf(m, "\t\tMin TMDS clock: %d kHz\n", clk);
+ drm_printf(p, "\t\tMin TMDS clock: %d kHz\n", clk);
bpc = drm_dp_downstream_max_bpc(dpcd, port_cap, drm_edid);
if (bpc > 0)
- seq_printf(m, "\t\tMax bpc: %d\n", bpc);
+ drm_printf(p, "\t\tMax bpc: %d\n", bpc);
}
}
EXPORT_SYMBOL(drm_dp_downstream_debug);
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index 00d207bfb71d..93e80b5e7ce8 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -219,12 +219,13 @@ static void intel_dp_info(struct seq_file *m, struct intel_connector *connector)
{
struct intel_encoder *intel_encoder = intel_attached_encoder(connector);
struct intel_dp *intel_dp = enc_to_intel_dp(intel_encoder);
+ struct drm_printer p = drm_seq_file_printer(m);
seq_printf(m, "\tDPCD rev: %x\n", intel_dp->dpcd[DP_DPCD_REV]);
seq_printf(m, "\taudio support: %s\n",
str_yes_no(connector->base.display_info.has_audio));
- drm_dp_downstream_debug(m, intel_dp->dpcd, intel_dp->downstream_ports,
+ drm_dp_downstream_debug(&p, intel_dp->dpcd, intel_dp->downstream_ports,
connector->detect_edid, &intel_dp->aux);
}
diff --git a/include/drm/display/drm_dp_helper.h b/include/drm/display/drm_dp_helper.h
index 5b05a7fbe174..f497c9f3a550 100644
--- a/include/drm/display/drm_dp_helper.h
+++ b/include/drm/display/drm_dp_helper.h
@@ -32,6 +32,7 @@
struct drm_device;
struct drm_dp_aux;
struct drm_panel;
+struct drm_printer;
bool drm_dp_channel_eq_ok(const u8 link_status[DP_LINK_STATUS_SIZE],
int lane_count);
@@ -744,7 +745,7 @@ struct drm_display_mode *drm_dp_downstream_mode(struct drm_device *dev,
const u8 dpcd[DP_RECEIVER_CAP_SIZE],
const u8 port_cap[4]);
int drm_dp_downstream_id(struct drm_dp_aux *aux, char id[6]);
-void drm_dp_downstream_debug(struct seq_file *m,
+void drm_dp_downstream_debug(struct drm_printer *p,
const u8 dpcd[DP_RECEIVER_CAP_SIZE],
const u8 port_cap[4],
const struct drm_edid *drm_edid,
--
2.47.3
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 02/13] drm/dp: prefer drm_printf_indent() over inline \t
2026-10-30 12:03 [PATCH 00/13] drm/dp, drm/i915: conversions from seq_file to drm_printer Jani Nikula
2026-10-30 12:03 ` [PATCH 01/13] drm/dp: pass struct drm_printer to drm_dp_downstream_debug() Jani Nikula
@ 2026-10-30 12:03 ` Jani Nikula
2026-10-30 12:03 ` [PATCH 03/13] drm/i915/debugfs: pass struct drm_printer to intel_plane_info() Jani Nikula
` (10 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2026-10-30 12:03 UTC (permalink / raw)
To: dri-devel, intel-gfx, intel-xe; +Cc: jani.nikula
We have a helper drm_printf_indent() for tab indenting the prints. It
makes the actual strings more readable, and highlights the indented
parts better in source.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/display/drm_dp_helper.c | 35 ++++++++++++-------------
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/display/drm_dp_helper.c b/drivers/gpu/drm/display/drm_dp_helper.c
index 166a77091abe..76d61e74309e 100644
--- a/drivers/gpu/drm/display/drm_dp_helper.c
+++ b/drivers/gpu/drm/display/drm_dp_helper.c
@@ -1683,68 +1683,67 @@ void drm_dp_downstream_debug(struct drm_printer *p,
int type = port_cap[0] & DP_DS_PORT_TYPE_MASK;
bool branch_device = drm_dp_is_branch(dpcd);
- drm_printf(p, "\tDP branch device present: %s\n",
- str_yes_no(branch_device));
+ drm_printf_indent(p, 1, "DP branch device present: %s\n",
+ str_yes_no(branch_device));
if (!branch_device)
return;
switch (type) {
case DP_DS_PORT_TYPE_DP:
- drm_puts(p, "\t\tType: DisplayPort\n");
+ drm_printf_indent(p, 2, "Type: DisplayPort\n");
break;
case DP_DS_PORT_TYPE_VGA:
- drm_puts(p, "\t\tType: VGA\n");
+ drm_printf_indent(p, 2, "Type: VGA\n");
break;
case DP_DS_PORT_TYPE_DVI:
- drm_puts(p, "\t\tType: DVI\n");
+ drm_printf_indent(p, 2, "Type: DVI\n");
break;
case DP_DS_PORT_TYPE_HDMI:
- drm_puts(p, "\t\tType: HDMI\n");
+ drm_printf_indent(p, 2, "Type: HDMI\n");
break;
case DP_DS_PORT_TYPE_NON_EDID:
- drm_puts(p, "\t\tType: others without EDID support\n");
+ drm_printf_indent(p, 2, "Type: others without EDID support\n");
break;
case DP_DS_PORT_TYPE_DP_DUALMODE:
- drm_puts(p, "\t\tType: DP++\n");
+ drm_printf_indent(p, 2, "Type: DP++\n");
break;
case DP_DS_PORT_TYPE_WIRELESS:
- drm_puts(p, "\t\tType: Wireless\n");
+ drm_printf_indent(p, 2, "Type: Wireless\n");
break;
default:
- drm_puts(p, "\t\tType: N/A\n");
+ drm_printf_indent(p, 2, "Type: N/A\n");
}
memset(id, 0, sizeof(id));
drm_dp_downstream_id(aux, id);
- drm_printf(p, "\t\tID: %s\n", id);
+ drm_printf_indent(p, 2, "ID: %s\n", id);
len = drm_dp_dpcd_read_data(aux, DP_BRANCH_HW_REV, &rev[0], 1);
if (!len)
- drm_printf(p, "\t\tHW: %d.%d\n",
- (rev[0] & 0xf0) >> 4, rev[0] & 0xf);
+ drm_printf_indent(p, 2, "HW: %d.%d\n", (rev[0] & 0xf0) >> 4, rev[0] & 0xf);
len = drm_dp_dpcd_read_data(aux, DP_BRANCH_SW_REV, rev, 2);
if (!len)
- drm_printf(p, "\t\tSW: %d.%d\n", rev[0], rev[1]);
+ drm_printf_indent(p, 2, "SW: %d.%d\n", rev[0], rev[1]);
if (detailed_cap_info) {
clk = drm_dp_downstream_max_dotclock(dpcd, port_cap);
if (clk > 0)
- drm_printf(p, "\t\tMax dot clock: %d kHz\n", clk);
+ drm_printf_indent(p, 2, "Max dot clock: %d kHz\n", clk);
clk = drm_dp_downstream_max_tmds_clock(dpcd, port_cap, drm_edid);
if (clk > 0)
- drm_printf(p, "\t\tMax TMDS clock: %d kHz\n", clk);
+ drm_printf_indent(p, 2, "Max TMDS clock: %d kHz\n", clk);
clk = drm_dp_downstream_min_tmds_clock(dpcd, port_cap, drm_edid);
if (clk > 0)
- drm_printf(p, "\t\tMin TMDS clock: %d kHz\n", clk);
+ drm_printf_indent(p, 2, "Min TMDS clock: %d kHz\n", clk);
bpc = drm_dp_downstream_max_bpc(dpcd, port_cap, drm_edid);
if (bpc > 0)
- drm_printf(p, "\t\tMax bpc: %d\n", bpc);
+ drm_printf_indent(p, 2, "Max bpc: %d\n", bpc);
}
}
EXPORT_SYMBOL(drm_dp_downstream_debug);
--
2.47.3
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 03/13] drm/i915/debugfs: pass struct drm_printer to intel_plane_info()
2026-10-30 12:03 [PATCH 00/13] drm/dp, drm/i915: conversions from seq_file to drm_printer Jani Nikula
2026-10-30 12:03 ` [PATCH 01/13] drm/dp: pass struct drm_printer to drm_dp_downstream_debug() Jani Nikula
2026-10-30 12:03 ` [PATCH 02/13] drm/dp: prefer drm_printf_indent() over inline \t Jani Nikula
@ 2026-10-30 12:03 ` Jani Nikula
2026-10-30 12:03 ` [PATCH 04/13] drm/i915/debugfs: pass struct drm_printer to crtc_updates_info() Jani Nikula
` (9 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2026-10-30 12:03 UTC (permalink / raw)
To: dri-devel, intel-gfx, intel-xe; +Cc: jani.nikula
Pass struct drm_printer to intel_plane_info() and its dependencies
intel_plane_uapi_info() and intel_plane_hw_info().
Prefer struct drm_printer * over struct seq_file * to unify and allow
use of drm_printer helpers.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
.../drm/i915/display/intel_display_debugfs.c | 28 +++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index 93e80b5e7ce8..7b82a51145da 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -344,7 +344,7 @@ static const char *plane_visibility(const struct intel_plane_state *plane_state)
return "hidden";
}
-static void intel_plane_uapi_info(struct seq_file *m, struct intel_plane *plane)
+static void intel_plane_uapi_info(struct drm_printer *p, struct intel_plane *plane)
{
const struct intel_plane_state *plane_state =
to_intel_plane_state(plane->base.state);
@@ -358,24 +358,24 @@ static void intel_plane_uapi_info(struct seq_file *m, struct intel_plane *plane)
plane_rotation(rot_str, sizeof(rot_str),
plane_state->uapi.rotation);
- seq_puts(m, "\t\tuapi: [FB:");
+ drm_puts(p, "\t\tuapi: [FB:");
if (fb)
- seq_printf(m, "%d] %p4cc,0x%llx,%dx%d", fb->base.id,
+ drm_printf(p, "%d] %p4cc,0x%llx,%dx%d", fb->base.id,
&fb->format->format, fb->modifier, fb->width,
fb->height);
else
- seq_puts(m, "0] n/a,0x0,0x0,");
- seq_printf(m, ", visible=%s, src=" DRM_RECT_FP_FMT ", dst=" DRM_RECT_FMT
+ drm_puts(p, "0] n/a,0x0,0x0,");
+ drm_printf(p, ", visible=%s, src=" DRM_RECT_FP_FMT ", dst=" DRM_RECT_FMT
", rotation=%s\n", plane_visibility(plane_state),
DRM_RECT_FP_ARG(&src), DRM_RECT_ARG(&dst), rot_str);
if (plane_state->planar_linked_plane)
- seq_printf(m, "\t\tplanar: Linked to [PLANE:%d:%s] as a %s\n",
+ drm_printf(p, "\t\tplanar: Linked to [PLANE:%d:%s] as a %s\n",
plane_state->planar_linked_plane->base.base.id, plane_state->planar_linked_plane->base.name,
plane_state->is_y_plane ? "Y plane" : "UV plane");
}
-static void intel_plane_hw_info(struct seq_file *m, struct intel_plane *plane)
+static void intel_plane_hw_info(struct drm_printer *p, struct intel_plane *plane)
{
const struct intel_plane_state *plane_state =
to_intel_plane_state(plane->base.state);
@@ -388,7 +388,7 @@ static void intel_plane_hw_info(struct seq_file *m, struct intel_plane *plane)
plane_rotation(rot_str, sizeof(rot_str),
plane_state->hw.rotation);
- seq_printf(m, "\t\thw: [FB:%d] %p4cc,0x%llx,%dx%d, visible=%s, src="
+ drm_printf(p, "\t\thw: [FB:%d] %p4cc,0x%llx,%dx%d, visible=%s, src="
DRM_RECT_FP_FMT ", dst=" DRM_RECT_FMT ", rotation=%s\n",
fb->base.id, &fb->format->format,
fb->modifier, fb->width, fb->height,
@@ -398,17 +398,17 @@ static void intel_plane_hw_info(struct seq_file *m, struct intel_plane *plane)
rot_str);
}
-static void intel_plane_info(struct seq_file *m, struct intel_crtc *crtc)
+static void intel_plane_info(struct drm_printer *p, struct intel_crtc *crtc)
{
- struct intel_display *display = node_to_intel_display(m->private);
+ struct intel_display *display = to_intel_display(crtc);
struct intel_plane *plane;
for_each_intel_plane_on_crtc(display->drm, crtc, plane) {
- seq_printf(m, "\t[PLANE:%d:%s]: type=%s\n",
+ drm_printf(p, "\t[PLANE:%d:%s]: type=%s\n",
plane->base.base.id, plane->base.name,
plane_type(plane->base.type));
- intel_plane_uapi_info(m, plane);
- intel_plane_hw_info(m, plane);
+ intel_plane_uapi_info(p, plane);
+ intel_plane_hw_info(p, plane);
}
}
@@ -593,7 +593,7 @@ static void intel_crtc_info(struct seq_file *m, struct intel_crtc *crtc)
crtc_state->uapi.encoder_mask)
intel_encoder_info(m, crtc, encoder);
- intel_plane_info(m, crtc);
+ intel_plane_info(&p, crtc);
seq_printf(m, "\tunderrun reporting: cpu=%s pch=%s\n",
str_yes_no(!crtc->cpu_fifo_underrun_disabled),
--
2.47.3
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 04/13] drm/i915/debugfs: pass struct drm_printer to crtc_updates_info()
2026-10-30 12:03 [PATCH 00/13] drm/dp, drm/i915: conversions from seq_file to drm_printer Jani Nikula
` (2 preceding siblings ...)
2026-10-30 12:03 ` [PATCH 03/13] drm/i915/debugfs: pass struct drm_printer to intel_plane_info() Jani Nikula
@ 2026-10-30 12:03 ` Jani Nikula
2026-10-30 12:03 ` [PATCH 05/13] drm/i915/debugfs: convert crtc_updates_info() to use drm_printf_indent() Jani Nikula
` (8 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2026-10-30 12:03 UTC (permalink / raw)
To: dri-devel, intel-gfx, intel-xe; +Cc: jani.nikula
Pass struct drm_printer to crtc_updates_info().
Prefer struct drm_printer * over struct seq_file * to unify and allow
use of drm_printer helpers.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
.../drm/i915/display/intel_display_debugfs.c | 23 +++++++++++--------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index 7b82a51145da..507cd8528906 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -442,7 +442,7 @@ static void intel_scaler_info(struct seq_file *m, struct intel_crtc *crtc)
}
#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_VBLANK_EVADE)
-static void crtc_updates_info(struct seq_file *m,
+static void crtc_updates_info(struct drm_printer *p,
struct intel_crtc *crtc,
const char *hdr)
{
@@ -452,7 +452,7 @@ static void crtc_updates_info(struct seq_file *m,
count = 0;
for (row = 0; row < ARRAY_SIZE(crtc->debug.vbl.times); row++)
count += crtc->debug.vbl.times[row];
- seq_printf(m, "%sUpdates: %llu\n", hdr, count);
+ drm_printf(p, "%sUpdates: %llu\n", hdr, count);
if (!count)
return;
@@ -481,22 +481,25 @@ static void crtc_updates_info(struct seq_file *m,
columns[8 + x] = '\0';
}
- seq_printf(m, "%s%s\n", hdr, columns);
+ drm_printf(p, "%s%s\n", hdr, columns);
}
- seq_printf(m, "%sMin update: %lluns\n",
+ drm_printf(p, "%sMin update: %lluns\n",
hdr, crtc->debug.vbl.min);
- seq_printf(m, "%sMax update: %lluns\n",
+ drm_printf(p, "%sMax update: %lluns\n",
hdr, crtc->debug.vbl.max);
- seq_printf(m, "%sAverage update: %lluns\n",
+ drm_printf(p, "%sAverage update: %lluns\n",
hdr, div64_u64(crtc->debug.vbl.sum, count));
- seq_printf(m, "%sOverruns > %uus: %u\n",
+ drm_printf(p, "%sOverruns > %uus: %u\n",
hdr, VBLANK_EVASION_TIME_US, crtc->debug.vbl.over);
}
static int crtc_updates_show(struct seq_file *m, void *data)
{
- crtc_updates_info(m, m->private, "");
+ struct drm_printer p = drm_seq_file_printer(m);
+
+ crtc_updates_info(&p, m->private, "");
+
return 0;
}
@@ -534,7 +537,7 @@ static void crtc_updates_add(struct intel_crtc *crtc)
}
#else
-static void crtc_updates_info(struct seq_file *m,
+static void crtc_updates_info(struct drm_printer *p,
struct intel_crtc *crtc,
const char *hdr)
{
@@ -599,7 +602,7 @@ static void intel_crtc_info(struct seq_file *m, struct intel_crtc *crtc)
str_yes_no(!crtc->cpu_fifo_underrun_disabled),
str_yes_no(!crtc->pch_fifo_underrun_disabled));
- crtc_updates_info(m, crtc, "\t");
+ crtc_updates_info(&p, crtc, "\t");
}
static int i915_display_info(struct seq_file *m, void *unused)
--
2.47.3
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 05/13] drm/i915/debugfs: convert crtc_updates_info() to use drm_printf_indent()
2026-10-30 12:03 [PATCH 00/13] drm/dp, drm/i915: conversions from seq_file to drm_printer Jani Nikula
` (3 preceding siblings ...)
2026-10-30 12:03 ` [PATCH 04/13] drm/i915/debugfs: pass struct drm_printer to crtc_updates_info() Jani Nikula
@ 2026-10-30 12:03 ` Jani Nikula
2026-10-30 12:03 ` [PATCH 06/13] drm/i915/debugfs: pass struct drm_printer to intel_scaler_info() Jani Nikula
` (7 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2026-10-30 12:03 UTC (permalink / raw)
To: dri-devel, intel-gfx, intel-xe; +Cc: jani.nikula
Passing the const char *hdr to crtc_updates_info() is only for the
indent. Switch to passing the number of indentation tabs instead, and
use drm_printf_indent(). It makes the actual strings more readable, and
highlights the indented parts better in source.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
.../drm/i915/display/intel_display_debugfs.c | 28 +++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index 507cd8528906..da70047f1449 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -444,7 +444,7 @@ static void intel_scaler_info(struct seq_file *m, struct intel_crtc *crtc)
#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_VBLANK_EVADE)
static void crtc_updates_info(struct drm_printer *p,
struct intel_crtc *crtc,
- const char *hdr)
+ int indent)
{
u64 count;
int row;
@@ -452,7 +452,7 @@ static void crtc_updates_info(struct drm_printer *p,
count = 0;
for (row = 0; row < ARRAY_SIZE(crtc->debug.vbl.times); row++)
count += crtc->debug.vbl.times[row];
- drm_printf(p, "%sUpdates: %llu\n", hdr, count);
+ drm_printf_indent(p, indent, "Updates: %llu\n", count);
if (!count)
return;
@@ -481,24 +481,24 @@ static void crtc_updates_info(struct drm_printer *p,
columns[8 + x] = '\0';
}
- drm_printf(p, "%s%s\n", hdr, columns);
+ drm_printf_indent(p, indent, "%s\n", columns);
}
- drm_printf(p, "%sMin update: %lluns\n",
- hdr, crtc->debug.vbl.min);
- drm_printf(p, "%sMax update: %lluns\n",
- hdr, crtc->debug.vbl.max);
- drm_printf(p, "%sAverage update: %lluns\n",
- hdr, div64_u64(crtc->debug.vbl.sum, count));
- drm_printf(p, "%sOverruns > %uus: %u\n",
- hdr, VBLANK_EVASION_TIME_US, crtc->debug.vbl.over);
+ drm_printf_indent(p, indent, "Min update: %lluns\n",
+ crtc->debug.vbl.min);
+ drm_printf_indent(p, indent, "Max update: %lluns\n",
+ crtc->debug.vbl.max);
+ drm_printf_indent(p, indent, "Average update: %lluns\n",
+ div64_u64(crtc->debug.vbl.sum, count));
+ drm_printf_indent(p, indent, "Overruns > %uus: %u\n",
+ VBLANK_EVASION_TIME_US, crtc->debug.vbl.over);
}
static int crtc_updates_show(struct seq_file *m, void *data)
{
struct drm_printer p = drm_seq_file_printer(m);
- crtc_updates_info(&p, m->private, "");
+ crtc_updates_info(&p, m->private, 0);
return 0;
}
@@ -539,7 +539,7 @@ static void crtc_updates_add(struct intel_crtc *crtc)
#else
static void crtc_updates_info(struct drm_printer *p,
struct intel_crtc *crtc,
- const char *hdr)
+ int indent)
{
}
@@ -602,7 +602,7 @@ static void intel_crtc_info(struct seq_file *m, struct intel_crtc *crtc)
str_yes_no(!crtc->cpu_fifo_underrun_disabled),
str_yes_no(!crtc->pch_fifo_underrun_disabled));
- crtc_updates_info(&p, crtc, "\t");
+ crtc_updates_info(&p, crtc, 1);
}
static int i915_display_info(struct seq_file *m, void *unused)
--
2.47.3
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 06/13] drm/i915/debugfs: pass struct drm_printer to intel_scaler_info()
2026-10-30 12:03 [PATCH 00/13] drm/dp, drm/i915: conversions from seq_file to drm_printer Jani Nikula
` (4 preceding siblings ...)
2026-10-30 12:03 ` [PATCH 05/13] drm/i915/debugfs: convert crtc_updates_info() to use drm_printf_indent() Jani Nikula
@ 2026-10-30 12:03 ` Jani Nikula
2026-10-30 12:03 ` [PATCH 07/13] drm/i915/debugfs: pass struct drm_printer to intel_encoder_info() Jani Nikula
` (6 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2026-10-30 12:03 UTC (permalink / raw)
To: dri-devel, intel-gfx, intel-xe; +Cc: jani.nikula
Pass struct drm_printer to intel_scaler_info().
Prefer struct drm_printer * over struct seq_file * to unify and allow
use of drm_printer helpers.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_display_debugfs.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index da70047f1449..7de84ac4323d 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -412,7 +412,7 @@ static void intel_plane_info(struct drm_printer *p, struct intel_crtc *crtc)
}
}
-static void intel_scaler_info(struct seq_file *m, struct intel_crtc *crtc)
+static void intel_scaler_info(struct drm_printer *p, struct intel_crtc *crtc)
{
const struct intel_crtc_state *crtc_state =
to_intel_crtc_state(crtc->base.state);
@@ -421,7 +421,7 @@ static void intel_scaler_info(struct seq_file *m, struct intel_crtc *crtc)
/* Not all platforms have a scaler */
if (num_scalers) {
- seq_printf(m, "\tnum_scalers=%d, scaler_users=%x scaler_id=%d scaling_filter=%d sharpness_strength=%d",
+ drm_printf(p, "\tnum_scalers=%d, scaler_users=%x scaler_id=%d scaling_filter=%d sharpness_strength=%d",
num_scalers,
crtc_state->scaler_state.scaler_users,
crtc_state->scaler_state.scaler_id,
@@ -432,12 +432,12 @@ static void intel_scaler_info(struct seq_file *m, struct intel_crtc *crtc)
const struct intel_scaler *sc =
&crtc_state->scaler_state.scalers[i];
- seq_printf(m, ", scalers[%d]: use=%s, mode=%x",
+ drm_printf(p, ", scalers[%d]: use=%s, mode=%x",
i, str_yes_no(sc->in_use), sc->mode);
}
- seq_puts(m, "\n");
+ drm_puts(p, "\n");
} else {
- seq_puts(m, "\tNo scalers available on this platform\n");
+ drm_puts(p, "\tNo scalers available on this platform\n");
}
}
@@ -577,7 +577,7 @@ static void intel_crtc_info(struct seq_file *m, struct intel_crtc *crtc)
seq_printf(m, "\tport_clock=%d, lane_count=%d\n",
crtc_state->port_clock, crtc_state->lane_count);
- intel_scaler_info(m, crtc);
+ intel_scaler_info(&p, crtc);
if (DISPLAY_VER(display) >= 9) {
u32 background = crtc_state->hw.background_color;
--
2.47.3
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 07/13] drm/i915/debugfs: pass struct drm_printer to intel_encoder_info()
2026-10-30 12:03 [PATCH 00/13] drm/dp, drm/i915: conversions from seq_file to drm_printer Jani Nikula
` (5 preceding siblings ...)
2026-10-30 12:03 ` [PATCH 06/13] drm/i915/debugfs: pass struct drm_printer to intel_scaler_info() Jani Nikula
@ 2026-10-30 12:03 ` Jani Nikula
2026-10-30 12:03 ` [PATCH 08/13] drm/i915/debugfs: pass struct drm_printer to intel_crtc_info() Jani Nikula
` (5 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2026-10-30 12:03 UTC (permalink / raw)
To: dri-devel, intel-gfx, intel-xe; +Cc: jani.nikula
Pass struct drm_printer to intel_encoder_info(). While at it, drop
unused crtc parameter.
Prefer struct drm_printer * over struct seq_file * to unify and allow
use of drm_printer helpers.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_display_debugfs.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index 7de84ac4323d..075f29c241d1 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -176,15 +176,14 @@ static void intel_seq_print_mode(struct seq_file *m, int tabs,
seq_printf(m, DRM_MODE_FMT "\n", DRM_MODE_ARG(mode));
}
-static void intel_encoder_info(struct seq_file *m,
- struct intel_crtc *crtc,
+static void intel_encoder_info(struct drm_printer *p,
struct intel_encoder *encoder)
{
- struct intel_display *display = node_to_intel_display(m->private);
+ struct intel_display *display = to_intel_display(encoder);
struct drm_connector_list_iter conn_iter;
struct drm_connector *connector;
- seq_printf(m, "\t[ENCODER:%d:%s]: connectors:\n",
+ drm_printf(p, "\t[ENCODER:%d:%s]: connectors:\n",
encoder->base.base.id, encoder->base.name);
drm_connector_list_iter_begin(display->drm, &conn_iter);
@@ -195,7 +194,7 @@ static void intel_encoder_info(struct seq_file *m,
if (conn_state->best_encoder != &encoder->base)
continue;
- seq_printf(m, "\t\t[CONNECTOR:%d:%s]\n",
+ drm_printf(p, "\t\t[CONNECTOR:%d:%s]\n",
connector->base.id, connector->name);
}
drm_connector_list_iter_end(&conn_iter);
@@ -594,7 +593,7 @@ static void intel_crtc_info(struct seq_file *m, struct intel_crtc *crtc)
for_each_intel_encoder_mask(display->drm, encoder,
crtc_state->uapi.encoder_mask)
- intel_encoder_info(m, crtc, encoder);
+ intel_encoder_info(&p, encoder);
intel_plane_info(&p, crtc);
--
2.47.3
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 08/13] drm/i915/debugfs: pass struct drm_printer to intel_crtc_info()
2026-10-30 12:03 [PATCH 00/13] drm/dp, drm/i915: conversions from seq_file to drm_printer Jani Nikula
` (6 preceding siblings ...)
2026-10-30 12:03 ` [PATCH 07/13] drm/i915/debugfs: pass struct drm_printer to intel_encoder_info() Jani Nikula
@ 2026-10-30 12:03 ` Jani Nikula
2026-10-30 12:03 ` [PATCH 09/13] drm/i915/debugfs: pass struct drm_printer to intel_{dp, dp_mst, hdmi}_crtc_info() Jani Nikula
` (4 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2026-10-30 12:03 UTC (permalink / raw)
To: dri-devel, intel-gfx, intel-xe; +Cc: jani.nikula
Pass struct drm_printer to intel_crtc_info().
Prefer struct drm_printer * over struct seq_file * to unify and allow
use of drm_printer helpers.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
.../drm/i915/display/intel_display_debugfs.c | 38 +++++++++----------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index 075f29c241d1..3faee47e5854 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -547,66 +547,66 @@ static void crtc_updates_add(struct intel_crtc *crtc)
}
#endif
-static void intel_crtc_info(struct seq_file *m, struct intel_crtc *crtc)
+static void intel_crtc_info(struct drm_printer *p, struct intel_crtc *crtc)
{
- struct intel_display *display = node_to_intel_display(m->private);
- struct drm_printer p = drm_seq_file_printer(m);
+ struct intel_display *display = to_intel_display(crtc);
const struct intel_crtc_state *crtc_state =
to_intel_crtc_state(crtc->base.state);
struct intel_encoder *encoder;
- seq_printf(m, "[CRTC:%d:%s]:\n",
+ drm_printf(p, "[CRTC:%d:%s]:\n",
crtc->base.base.id, crtc->base.name);
- seq_printf(m, "\tuapi: enable=%s, active=%s, mode=" DRM_MODE_FMT "\n",
+ drm_printf(p, "\tuapi: enable=%s, active=%s, mode=" DRM_MODE_FMT "\n",
str_yes_no(crtc_state->uapi.enable),
str_yes_no(crtc_state->uapi.active),
DRM_MODE_ARG(&crtc_state->uapi.mode));
- seq_printf(m, "\thw: enable=%s, active=%s\n",
+ drm_printf(p, "\thw: enable=%s, active=%s\n",
str_yes_no(crtc_state->hw.enable), str_yes_no(crtc_state->hw.active));
- seq_printf(m, "\tadjusted_mode=" DRM_MODE_FMT "\n",
+ drm_printf(p, "\tadjusted_mode=" DRM_MODE_FMT "\n",
DRM_MODE_ARG(&crtc_state->hw.adjusted_mode));
- seq_printf(m, "\tpipe__mode=" DRM_MODE_FMT "\n",
+ drm_printf(p, "\tpipe__mode=" DRM_MODE_FMT "\n",
DRM_MODE_ARG(&crtc_state->hw.pipe_mode));
- seq_printf(m, "\tpipe src=" DRM_RECT_FMT ", dither=%s, bpp=%d\n",
+ drm_printf(p, "\tpipe src=" DRM_RECT_FMT ", dither=%s, bpp=%d\n",
DRM_RECT_ARG(&crtc_state->pipe_src),
str_yes_no(crtc_state->dither), crtc_state->pipe_bpp);
- seq_printf(m, "\tport_clock=%d, lane_count=%d\n",
+ drm_printf(p, "\tport_clock=%d, lane_count=%d\n",
crtc_state->port_clock, crtc_state->lane_count);
- intel_scaler_info(&p, crtc);
+ intel_scaler_info(p, crtc);
if (DISPLAY_VER(display) >= 9) {
u32 background = crtc_state->hw.background_color;
- seq_printf(m, "\tbackground color (10bpc XRGB2101010): %08x\n", background);
+ drm_printf(p, "\tbackground color (10bpc XRGB2101010): %08x\n", background);
}
if (crtc_state->joiner_pipes)
- seq_printf(m, "\tLinked to 0x%x pipes as a %s\n",
+ drm_printf(p, "\tLinked to 0x%x pipes as a %s\n",
crtc_state->joiner_pipes,
intel_crtc_is_joiner_secondary(crtc_state) ? "slave" : "master");
- intel_vdsc_state_dump(&p, 1, crtc_state);
+ intel_vdsc_state_dump(p, 1, crtc_state);
for_each_intel_encoder_mask(display->drm, encoder,
crtc_state->uapi.encoder_mask)
- intel_encoder_info(&p, encoder);
+ intel_encoder_info(p, encoder);
- intel_plane_info(&p, crtc);
+ intel_plane_info(p, crtc);
- seq_printf(m, "\tunderrun reporting: cpu=%s pch=%s\n",
+ drm_printf(p, "\tunderrun reporting: cpu=%s pch=%s\n",
str_yes_no(!crtc->cpu_fifo_underrun_disabled),
str_yes_no(!crtc->pch_fifo_underrun_disabled));
- crtc_updates_info(&p, crtc, 1);
+ crtc_updates_info(p, crtc, 1);
}
static int i915_display_info(struct seq_file *m, void *unused)
{
struct intel_display *display = node_to_intel_display(m->private);
+ struct drm_printer p = drm_seq_file_printer(m);
struct intel_crtc *crtc;
struct drm_connector *connector;
struct drm_connector_list_iter conn_iter;
@@ -619,7 +619,7 @@ static int i915_display_info(struct seq_file *m, void *unused)
seq_printf(m, "CRTC info\n");
seq_printf(m, "---------\n");
for_each_intel_crtc(display, crtc)
- intel_crtc_info(m, crtc);
+ intel_crtc_info(&p, crtc);
seq_printf(m, "\n");
seq_printf(m, "Connector info\n");
--
2.47.3
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 09/13] drm/i915/debugfs: pass struct drm_printer to intel_{dp, dp_mst, hdmi}_crtc_info()
2026-10-30 12:03 [PATCH 00/13] drm/dp, drm/i915: conversions from seq_file to drm_printer Jani Nikula
` (7 preceding siblings ...)
2026-10-30 12:03 ` [PATCH 08/13] drm/i915/debugfs: pass struct drm_printer to intel_crtc_info() Jani Nikula
@ 2026-10-30 12:03 ` Jani Nikula
2026-10-30 12:10 ` sashiko-bot
2026-10-30 12:03 ` [PATCH 10/13] drm/i915/debugfs: pass struct drm_printer to intel_hdcp_info() Jani Nikula
` (3 subsequent siblings)
12 siblings, 1 reply; 15+ messages in thread
From: Jani Nikula @ 2026-10-30 12:03 UTC (permalink / raw)
To: dri-devel, intel-gfx, intel-xe; +Cc: jani.nikula
Pass struct drm_printer to intel_dp_info(), intel_dp_mst_info(), and
intel_hdmi_info().
Prefer struct drm_printer * over struct seq_file * to unify and allow
use of drm_printer helpers.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
.../drm/i915/display/intel_display_debugfs.c | 23 +++++++++----------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index 3faee47e5854..3378e95ab948 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -214,34 +214,33 @@ static void intel_panel_info(struct seq_file *m,
intel_seq_print_mode(m, 2, fixed_mode);
}
-static void intel_dp_info(struct seq_file *m, struct intel_connector *connector)
+static void intel_dp_info(struct drm_printer *p, struct intel_connector *connector)
{
struct intel_encoder *intel_encoder = intel_attached_encoder(connector);
struct intel_dp *intel_dp = enc_to_intel_dp(intel_encoder);
- struct drm_printer p = drm_seq_file_printer(m);
- seq_printf(m, "\tDPCD rev: %x\n", intel_dp->dpcd[DP_DPCD_REV]);
- seq_printf(m, "\taudio support: %s\n",
+ drm_printf(p, "\tDPCD rev: %x\n", intel_dp->dpcd[DP_DPCD_REV]);
+ drm_printf(p, "\taudio support: %s\n",
str_yes_no(connector->base.display_info.has_audio));
- drm_dp_downstream_debug(&p, intel_dp->dpcd, intel_dp->downstream_ports,
+ drm_dp_downstream_debug(p, intel_dp->dpcd, intel_dp->downstream_ports,
connector->detect_edid, &intel_dp->aux);
}
-static void intel_dp_mst_info(struct seq_file *m,
+static void intel_dp_mst_info(struct drm_printer *p,
struct intel_connector *connector)
{
bool has_audio = connector->base.display_info.has_audio;
- seq_printf(m, "\taudio support: %s\n", str_yes_no(has_audio));
+ drm_printf(p, "\taudio support: %s\n", str_yes_no(has_audio));
}
-static void intel_hdmi_info(struct seq_file *m,
+static void intel_hdmi_info(struct drm_printer *p,
struct intel_connector *connector)
{
bool has_audio = connector->base.display_info.has_audio;
- seq_printf(m, "\taudio support: %s\n", str_yes_no(has_audio));
+ drm_printf(p, "\taudio support: %s\n", str_yes_no(has_audio));
}
static void intel_connector_info(struct seq_file *m,
@@ -270,13 +269,13 @@ static void intel_connector_info(struct seq_file *m,
case DRM_MODE_CONNECTOR_DisplayPort:
case DRM_MODE_CONNECTOR_eDP:
if (intel_connector->mst.dp)
- intel_dp_mst_info(m, intel_connector);
+ intel_dp_mst_info(&p, intel_connector);
else
- intel_dp_info(m, intel_connector);
+ intel_dp_info(&p, intel_connector);
dig_port = dp_to_dig_port(intel_attached_dp(intel_connector));
break;
case DRM_MODE_CONNECTOR_HDMIA:
- intel_hdmi_info(m, intel_connector);
+ intel_hdmi_info(&p, intel_connector);
dig_port = hdmi_to_dig_port(intel_attached_hdmi(intel_connector));
break;
default:
--
2.47.3
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 10/13] drm/i915/debugfs: pass struct drm_printer to intel_hdcp_info()
2026-10-30 12:03 [PATCH 00/13] drm/dp, drm/i915: conversions from seq_file to drm_printer Jani Nikula
` (8 preceding siblings ...)
2026-10-30 12:03 ` [PATCH 09/13] drm/i915/debugfs: pass struct drm_printer to intel_{dp, dp_mst, hdmi}_crtc_info() Jani Nikula
@ 2026-10-30 12:03 ` Jani Nikula
2026-10-30 12:03 ` [PATCH 11/13] drm/i915/debugfs: refactor intel_seq_print_mode() into intel_print_mode() Jani Nikula
` (2 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2026-10-30 12:03 UTC (permalink / raw)
To: dri-devel, intel-gfx, intel-xe; +Cc: jani.nikula
Pass struct drm_printer to intel_hdcp_info() and __intel_hdcp_info().
Prefer struct drm_printer * over struct seq_file * to unify and allow
use of drm_printer helpers.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
.../drm/i915/display/intel_display_debugfs.c | 2 +-
drivers/gpu/drm/i915/display/intel_hdcp.c | 27 ++++++++++---------
drivers/gpu/drm/i915/display/intel_hdcp.h | 4 +--
3 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index 3378e95ab948..442912a1fc02 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -285,7 +285,7 @@ static void intel_connector_info(struct seq_file *m,
if (dig_port != NULL && intel_encoder_is_tc(&dig_port->base))
intel_tc_info(&p, dig_port);
- intel_hdcp_info(m, intel_connector);
+ intel_hdcp_info(&p, intel_connector);
seq_printf(m, "\tmax bpc: %u\n", connector->display_info.bpc);
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index e56df337dc6d..dad0c854e4fa 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -2746,13 +2746,13 @@ void intel_hdcp_handle_cp_irq(struct intel_connector *connector)
queue_delayed_work(display->wq.unordered, &hdcp->check_work, 0);
}
-static void __intel_hdcp_info(struct seq_file *m, struct intel_connector *connector,
+static void __intel_hdcp_info(struct drm_printer *p, struct intel_connector *connector,
bool remote_req)
{
bool hdcp_cap = false, hdcp2_cap = false;
if (!connector->hdcp.shim) {
- seq_puts(m, "No Connector Support");
+ drm_puts(p, "No Connector Support");
goto out;
}
@@ -2764,31 +2764,32 @@ static void __intel_hdcp_info(struct seq_file *m, struct intel_connector *connec
}
if (hdcp_cap)
- seq_puts(m, "HDCP1.4 ");
+ drm_puts(p, "HDCP1.4 ");
if (hdcp2_cap)
- seq_puts(m, "HDCP2.2 ");
+ drm_puts(p, "HDCP2.2 ");
if (!hdcp_cap && !hdcp2_cap)
- seq_puts(m, "None");
+ drm_puts(p, "None");
out:
- seq_puts(m, "\n");
+ drm_puts(p, "\n");
}
-void intel_hdcp_info(struct seq_file *m, struct intel_connector *connector)
+void intel_hdcp_info(struct drm_printer *p, struct intel_connector *connector)
{
- seq_puts(m, "\tHDCP version: ");
+ drm_puts(p, "\tHDCP version: ");
if (connector->mst.dp) {
- __intel_hdcp_info(m, connector, true);
- seq_puts(m, "\tMST Hub HDCP version: ");
+ __intel_hdcp_info(p, connector, true);
+ drm_puts(p, "\tMST Hub HDCP version: ");
}
- __intel_hdcp_info(m, connector, false);
+ __intel_hdcp_info(p, connector, false);
}
static int intel_hdcp_sink_capability_show(struct seq_file *m, void *data)
{
struct intel_connector *connector = m->private;
struct intel_display *display = to_intel_display(connector);
+ struct drm_printer p = drm_seq_file_printer(m);
int ret;
ret = drm_modeset_lock_single_interruptible(&display->drm->mode_config.connection_mutex);
@@ -2801,9 +2802,9 @@ static int intel_hdcp_sink_capability_show(struct seq_file *m, void *data)
goto out;
}
- seq_printf(m, "%s:%d HDCP version: ", connector->base.name,
+ drm_printf(&p, "%s:%d HDCP version: ", connector->base.name,
connector->base.base.id);
- __intel_hdcp_info(m, connector, false);
+ __intel_hdcp_info(&p, connector, false);
out:
drm_modeset_unlock(&display->drm->mode_config.connection_mutex);
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.h b/drivers/gpu/drm/i915/display/intel_hdcp.h
index efe86808e17e..00f2b265ab4a 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.h
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.h
@@ -12,6 +12,7 @@
struct drm_connector;
struct drm_connector_state;
+struct drm_printer;
struct intel_atomic_state;
struct intel_connector;
struct intel_crtc_state;
@@ -19,7 +20,6 @@ struct intel_digital_port;
struct intel_display;
struct intel_encoder;
struct intel_hdcp_shim;
-struct seq_file;
enum port;
void intel_hdcp_atomic_check(struct drm_connector *connector,
@@ -44,7 +44,7 @@ void intel_hdcp_component_fini(struct intel_display *display);
void intel_hdcp_cleanup(struct intel_connector *connector);
void intel_hdcp_handle_cp_irq(struct intel_connector *connector);
-void intel_hdcp_info(struct seq_file *m, struct intel_connector *connector);
+void intel_hdcp_info(struct drm_printer *p, struct intel_connector *connector);
void intel_hdcp_connector_debugfs_add(struct intel_connector *connector);
#endif /* __INTEL_HDCP_H__ */
--
2.47.3
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 11/13] drm/i915/debugfs: refactor intel_seq_print_mode() into intel_print_mode()
2026-10-30 12:03 [PATCH 00/13] drm/dp, drm/i915: conversions from seq_file to drm_printer Jani Nikula
` (9 preceding siblings ...)
2026-10-30 12:03 ` [PATCH 10/13] drm/i915/debugfs: pass struct drm_printer to intel_hdcp_info() Jani Nikula
@ 2026-10-30 12:03 ` Jani Nikula
2026-10-30 12:03 ` [PATCH 12/13] drm/i915/debugfs: pass struct drm_printer to intel_connector_info() Jani Nikula
2026-10-30 12:03 ` [PATCH 13/13] drm/i915/debugfs: prefer drm_printf_indent() over inline \t Jani Nikula
12 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2026-10-30 12:03 UTC (permalink / raw)
To: dri-devel, intel-gfx, intel-xe; +Cc: jani.nikula
Pass struct drm_printer to intel_seq_print_mode() and rename to
intel_print_mode(). Use drm_printf_indent() instead of
hand-rolling. Also pass struct drm_printer to intel_panel_info().
Prefer struct drm_printer * over struct seq_file * to unify and allow
use of drm_printer helpers.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
.../drm/i915/display/intel_display_debugfs.c | 21 +++++++------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index 442912a1fc02..3844c909efc6 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -165,15 +165,10 @@ static int i915_power_domain_info(struct seq_file *m, void *unused)
return 0;
}
-static void intel_seq_print_mode(struct seq_file *m, int tabs,
- const struct drm_display_mode *mode)
+static void intel_print_mode(struct drm_printer *p, int indent,
+ const struct drm_display_mode *mode)
{
- int i;
-
- for (i = 0; i < tabs; i++)
- seq_putc(m, '\t');
-
- seq_printf(m, DRM_MODE_FMT "\n", DRM_MODE_ARG(mode));
+ drm_printf_indent(p, indent, DRM_MODE_FMT "\n", DRM_MODE_ARG(mode));
}
static void intel_encoder_info(struct drm_printer *p,
@@ -200,7 +195,7 @@ static void intel_encoder_info(struct drm_printer *p,
drm_connector_list_iter_end(&conn_iter);
}
-static void intel_panel_info(struct seq_file *m,
+static void intel_panel_info(struct drm_printer *p,
struct intel_connector *connector)
{
const struct drm_display_mode *fixed_mode;
@@ -208,10 +203,10 @@ static void intel_panel_info(struct seq_file *m,
if (list_empty(&connector->panel.fixed_modes))
return;
- seq_puts(m, "\tfixed modes:\n");
+ drm_puts(p, "\tfixed modes:\n");
list_for_each_entry(fixed_mode, &connector->panel.fixed_modes, head)
- intel_seq_print_mode(m, 2, fixed_mode);
+ intel_print_mode(p, 2, fixed_mode);
}
static void intel_dp_info(struct drm_printer *p, struct intel_connector *connector)
@@ -289,11 +284,11 @@ static void intel_connector_info(struct seq_file *m,
seq_printf(m, "\tmax bpc: %u\n", connector->display_info.bpc);
- intel_panel_info(m, intel_connector);
+ intel_panel_info(&p, intel_connector);
seq_printf(m, "\tmodes:\n");
list_for_each_entry(mode, &connector->modes, head)
- intel_seq_print_mode(m, 2, mode);
+ intel_print_mode(&p, 2, mode);
}
static const char *plane_type(enum drm_plane_type type)
--
2.47.3
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 12/13] drm/i915/debugfs: pass struct drm_printer to intel_connector_info()
2026-10-30 12:03 [PATCH 00/13] drm/dp, drm/i915: conversions from seq_file to drm_printer Jani Nikula
` (10 preceding siblings ...)
2026-10-30 12:03 ` [PATCH 11/13] drm/i915/debugfs: refactor intel_seq_print_mode() into intel_print_mode() Jani Nikula
@ 2026-10-30 12:03 ` Jani Nikula
2026-10-30 12:03 ` [PATCH 13/13] drm/i915/debugfs: prefer drm_printf_indent() over inline \t Jani Nikula
12 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2026-10-30 12:03 UTC (permalink / raw)
To: dri-devel, intel-gfx, intel-xe; +Cc: jani.nikula
Pass struct drm_printer to intel_connector_info().
Prefer struct drm_printer * over struct seq_file * to unify and allow
use of drm_printer helpers.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
.../drm/i915/display/intel_display_debugfs.c | 31 +++++++++----------
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index 3844c909efc6..a0644959d30e 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -238,39 +238,38 @@ static void intel_hdmi_info(struct drm_printer *p,
drm_printf(p, "\taudio support: %s\n", str_yes_no(has_audio));
}
-static void intel_connector_info(struct seq_file *m,
+static void intel_connector_info(struct drm_printer *p,
struct drm_connector *connector)
{
struct intel_connector *intel_connector = to_intel_connector(connector);
const struct drm_display_mode *mode;
- struct drm_printer p = drm_seq_file_printer(m);
struct intel_digital_port *dig_port = NULL;
- seq_printf(m, "[CONNECTOR:%d:%s]: status: %s\n",
+ drm_printf(p, "[CONNECTOR:%d:%s]: status: %s\n",
connector->base.id, connector->name,
drm_get_connector_status_name(connector->status));
if (connector->status == connector_status_disconnected)
return;
- seq_printf(m, "\tphysical dimensions: %dx%dmm\n",
+ drm_printf(p, "\tphysical dimensions: %dx%dmm\n",
connector->display_info.width_mm,
connector->display_info.height_mm);
- seq_printf(m, "\tsubpixel order: %s\n",
+ drm_printf(p, "\tsubpixel order: %s\n",
drm_get_subpixel_order_name(connector->display_info.subpixel_order));
- seq_printf(m, "\tCEA rev: %d\n", connector->display_info.cea_rev);
+ drm_printf(p, "\tCEA rev: %d\n", connector->display_info.cea_rev);
switch (connector->connector_type) {
case DRM_MODE_CONNECTOR_DisplayPort:
case DRM_MODE_CONNECTOR_eDP:
if (intel_connector->mst.dp)
- intel_dp_mst_info(&p, intel_connector);
+ intel_dp_mst_info(p, intel_connector);
else
- intel_dp_info(&p, intel_connector);
+ intel_dp_info(p, intel_connector);
dig_port = dp_to_dig_port(intel_attached_dp(intel_connector));
break;
case DRM_MODE_CONNECTOR_HDMIA:
- intel_hdmi_info(&p, intel_connector);
+ intel_hdmi_info(p, intel_connector);
dig_port = hdmi_to_dig_port(intel_attached_hdmi(intel_connector));
break;
default:
@@ -278,17 +277,17 @@ static void intel_connector_info(struct seq_file *m,
}
if (dig_port != NULL && intel_encoder_is_tc(&dig_port->base))
- intel_tc_info(&p, dig_port);
+ intel_tc_info(p, dig_port);
- intel_hdcp_info(&p, intel_connector);
+ intel_hdcp_info(p, intel_connector);
- seq_printf(m, "\tmax bpc: %u\n", connector->display_info.bpc);
+ drm_printf(p, "\tmax bpc: %u\n", connector->display_info.bpc);
- intel_panel_info(&p, intel_connector);
+ intel_panel_info(p, intel_connector);
- seq_printf(m, "\tmodes:\n");
+ drm_printf(p, "\tmodes:\n");
list_for_each_entry(mode, &connector->modes, head)
- intel_print_mode(&p, 2, mode);
+ intel_print_mode(p, 2, mode);
}
static const char *plane_type(enum drm_plane_type type)
@@ -620,7 +619,7 @@ static int i915_display_info(struct seq_file *m, void *unused)
seq_printf(m, "--------------\n");
drm_connector_list_iter_begin(display->drm, &conn_iter);
drm_for_each_connector_iter(connector, &conn_iter)
- intel_connector_info(m, connector);
+ intel_connector_info(&p, connector);
drm_connector_list_iter_end(&conn_iter);
drm_modeset_unlock_all(display->drm);
--
2.47.3
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 13/13] drm/i915/debugfs: prefer drm_printf_indent() over inline \t
2026-10-30 12:03 [PATCH 00/13] drm/dp, drm/i915: conversions from seq_file to drm_printer Jani Nikula
` (11 preceding siblings ...)
2026-10-30 12:03 ` [PATCH 12/13] drm/i915/debugfs: pass struct drm_printer to intel_connector_info() Jani Nikula
@ 2026-10-30 12:03 ` Jani Nikula
12 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2026-10-30 12:03 UTC (permalink / raw)
To: dri-devel, intel-gfx, intel-xe; +Cc: jani.nikula
We have a helper drm_printf_indent() for tab indenting the prints. It
makes the actual strings more readable, and highlights the indented
parts better in source.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
.../drm/i915/display/intel_display_debugfs.c | 124 +++++++++---------
1 file changed, 62 insertions(+), 62 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index a0644959d30e..9332532b5a60 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -178,8 +178,8 @@ static void intel_encoder_info(struct drm_printer *p,
struct drm_connector_list_iter conn_iter;
struct drm_connector *connector;
- drm_printf(p, "\t[ENCODER:%d:%s]: connectors:\n",
- encoder->base.base.id, encoder->base.name);
+ drm_printf_indent(p, 1, "[ENCODER:%d:%s]: connectors:\n",
+ encoder->base.base.id, encoder->base.name);
drm_connector_list_iter_begin(display->drm, &conn_iter);
drm_for_each_connector_iter(connector, &conn_iter) {
@@ -189,8 +189,8 @@ static void intel_encoder_info(struct drm_printer *p,
if (conn_state->best_encoder != &encoder->base)
continue;
- drm_printf(p, "\t\t[CONNECTOR:%d:%s]\n",
- connector->base.id, connector->name);
+ drm_printf_indent(p, 2, "[CONNECTOR:%d:%s]\n",
+ connector->base.id, connector->name);
}
drm_connector_list_iter_end(&conn_iter);
}
@@ -203,7 +203,7 @@ static void intel_panel_info(struct drm_printer *p,
if (list_empty(&connector->panel.fixed_modes))
return;
- drm_puts(p, "\tfixed modes:\n");
+ drm_printf_indent(p, 1, "fixed modes:\n");
list_for_each_entry(fixed_mode, &connector->panel.fixed_modes, head)
intel_print_mode(p, 2, fixed_mode);
@@ -214,9 +214,9 @@ static void intel_dp_info(struct drm_printer *p, struct intel_connector *connect
struct intel_encoder *intel_encoder = intel_attached_encoder(connector);
struct intel_dp *intel_dp = enc_to_intel_dp(intel_encoder);
- drm_printf(p, "\tDPCD rev: %x\n", intel_dp->dpcd[DP_DPCD_REV]);
- drm_printf(p, "\taudio support: %s\n",
- str_yes_no(connector->base.display_info.has_audio));
+ drm_printf_indent(p, 1, "DPCD rev: %x\n", intel_dp->dpcd[DP_DPCD_REV]);
+ drm_printf_indent(p, 1, "audio support: %s\n",
+ str_yes_no(connector->base.display_info.has_audio));
drm_dp_downstream_debug(p, intel_dp->dpcd, intel_dp->downstream_ports,
connector->detect_edid, &intel_dp->aux);
@@ -227,7 +227,7 @@ static void intel_dp_mst_info(struct drm_printer *p,
{
bool has_audio = connector->base.display_info.has_audio;
- drm_printf(p, "\taudio support: %s\n", str_yes_no(has_audio));
+ drm_printf_indent(p, 1, "audio support: %s\n", str_yes_no(has_audio));
}
static void intel_hdmi_info(struct drm_printer *p,
@@ -235,7 +235,7 @@ static void intel_hdmi_info(struct drm_printer *p,
{
bool has_audio = connector->base.display_info.has_audio;
- drm_printf(p, "\taudio support: %s\n", str_yes_no(has_audio));
+ drm_printf_indent(p, 1, "audio support: %s\n", str_yes_no(has_audio));
}
static void intel_connector_info(struct drm_printer *p,
@@ -252,12 +252,12 @@ static void intel_connector_info(struct drm_printer *p,
if (connector->status == connector_status_disconnected)
return;
- drm_printf(p, "\tphysical dimensions: %dx%dmm\n",
- connector->display_info.width_mm,
- connector->display_info.height_mm);
- drm_printf(p, "\tsubpixel order: %s\n",
- drm_get_subpixel_order_name(connector->display_info.subpixel_order));
- drm_printf(p, "\tCEA rev: %d\n", connector->display_info.cea_rev);
+ drm_printf_indent(p, 1, "physical dimensions: %dx%dmm\n",
+ connector->display_info.width_mm,
+ connector->display_info.height_mm);
+ drm_printf_indent(p, 1, "subpixel order: %s\n",
+ drm_get_subpixel_order_name(connector->display_info.subpixel_order));
+ drm_printf_indent(p, 1, "CEA rev: %d\n", connector->display_info.cea_rev);
switch (connector->connector_type) {
case DRM_MODE_CONNECTOR_DisplayPort:
@@ -281,11 +281,11 @@ static void intel_connector_info(struct drm_printer *p,
intel_hdcp_info(p, intel_connector);
- drm_printf(p, "\tmax bpc: %u\n", connector->display_info.bpc);
+ drm_printf_indent(p, 1, "max bpc: %u\n", connector->display_info.bpc);
intel_panel_info(p, intel_connector);
- drm_printf(p, "\tmodes:\n");
+ drm_printf_indent(p, 1, "modes:\n");
list_for_each_entry(mode, &connector->modes, head)
intel_print_mode(p, 2, mode);
}
@@ -350,7 +350,7 @@ static void intel_plane_uapi_info(struct drm_printer *p, struct intel_plane *pla
plane_rotation(rot_str, sizeof(rot_str),
plane_state->uapi.rotation);
- drm_puts(p, "\t\tuapi: [FB:");
+ drm_printf_indent(p, 2, "uapi: [FB:");
if (fb)
drm_printf(p, "%d] %p4cc,0x%llx,%dx%d", fb->base.id,
&fb->format->format, fb->modifier, fb->width,
@@ -362,9 +362,9 @@ static void intel_plane_uapi_info(struct drm_printer *p, struct intel_plane *pla
DRM_RECT_FP_ARG(&src), DRM_RECT_ARG(&dst), rot_str);
if (plane_state->planar_linked_plane)
- drm_printf(p, "\t\tplanar: Linked to [PLANE:%d:%s] as a %s\n",
- plane_state->planar_linked_plane->base.base.id, plane_state->planar_linked_plane->base.name,
- plane_state->is_y_plane ? "Y plane" : "UV plane");
+ drm_printf_indent(p, 2, "planar: Linked to [PLANE:%d:%s] as a %s\n",
+ plane_state->planar_linked_plane->base.base.id, plane_state->planar_linked_plane->base.name,
+ plane_state->is_y_plane ? "Y plane" : "UV plane");
}
static void intel_plane_hw_info(struct drm_printer *p, struct intel_plane *plane)
@@ -380,14 +380,14 @@ static void intel_plane_hw_info(struct drm_printer *p, struct intel_plane *plane
plane_rotation(rot_str, sizeof(rot_str),
plane_state->hw.rotation);
- drm_printf(p, "\t\thw: [FB:%d] %p4cc,0x%llx,%dx%d, visible=%s, src="
- DRM_RECT_FP_FMT ", dst=" DRM_RECT_FMT ", rotation=%s\n",
- fb->base.id, &fb->format->format,
- fb->modifier, fb->width, fb->height,
- str_yes_no(plane_state->uapi.visible),
- DRM_RECT_FP_ARG(&plane_state->uapi.src),
- DRM_RECT_ARG(&plane_state->uapi.dst),
- rot_str);
+ drm_printf_indent(p, 2, "hw: [FB:%d] %p4cc,0x%llx,%dx%d, visible=%s, src="
+ DRM_RECT_FP_FMT ", dst=" DRM_RECT_FMT ", rotation=%s\n",
+ fb->base.id, &fb->format->format,
+ fb->modifier, fb->width, fb->height,
+ str_yes_no(plane_state->uapi.visible),
+ DRM_RECT_FP_ARG(&plane_state->uapi.src),
+ DRM_RECT_ARG(&plane_state->uapi.dst),
+ rot_str);
}
static void intel_plane_info(struct drm_printer *p, struct intel_crtc *crtc)
@@ -396,9 +396,9 @@ static void intel_plane_info(struct drm_printer *p, struct intel_crtc *crtc)
struct intel_plane *plane;
for_each_intel_plane_on_crtc(display->drm, crtc, plane) {
- drm_printf(p, "\t[PLANE:%d:%s]: type=%s\n",
- plane->base.base.id, plane->base.name,
- plane_type(plane->base.type));
+ drm_printf_indent(p, 1, "[PLANE:%d:%s]: type=%s\n",
+ plane->base.base.id, plane->base.name,
+ plane_type(plane->base.type));
intel_plane_uapi_info(p, plane);
intel_plane_hw_info(p, plane);
}
@@ -413,12 +413,12 @@ static void intel_scaler_info(struct drm_printer *p, struct intel_crtc *crtc)
/* Not all platforms have a scaler */
if (num_scalers) {
- drm_printf(p, "\tnum_scalers=%d, scaler_users=%x scaler_id=%d scaling_filter=%d sharpness_strength=%d",
- num_scalers,
- crtc_state->scaler_state.scaler_users,
- crtc_state->scaler_state.scaler_id,
- crtc_state->hw.scaling_filter,
- crtc_state->hw.sharpness_strength);
+ drm_printf_indent(p, 1, "num_scalers=%d, scaler_users=%x scaler_id=%d scaling_filter=%d sharpness_strength=%d",
+ num_scalers,
+ crtc_state->scaler_state.scaler_users,
+ crtc_state->scaler_state.scaler_id,
+ crtc_state->hw.scaling_filter,
+ crtc_state->hw.sharpness_strength);
for (i = 0; i < num_scalers; i++) {
const struct intel_scaler *sc =
@@ -429,7 +429,7 @@ static void intel_scaler_info(struct drm_printer *p, struct intel_crtc *crtc)
}
drm_puts(p, "\n");
} else {
- drm_puts(p, "\tNo scalers available on this platform\n");
+ drm_printf_indent(p, 1, "No scalers available on this platform\n");
}
}
@@ -550,36 +550,36 @@ static void intel_crtc_info(struct drm_printer *p, struct intel_crtc *crtc)
drm_printf(p, "[CRTC:%d:%s]:\n",
crtc->base.base.id, crtc->base.name);
- drm_printf(p, "\tuapi: enable=%s, active=%s, mode=" DRM_MODE_FMT "\n",
- str_yes_no(crtc_state->uapi.enable),
- str_yes_no(crtc_state->uapi.active),
- DRM_MODE_ARG(&crtc_state->uapi.mode));
+ drm_printf_indent(p, 1, "uapi: enable=%s, active=%s, mode=" DRM_MODE_FMT "\n",
+ str_yes_no(crtc_state->uapi.enable),
+ str_yes_no(crtc_state->uapi.active),
+ DRM_MODE_ARG(&crtc_state->uapi.mode));
- drm_printf(p, "\thw: enable=%s, active=%s\n",
- str_yes_no(crtc_state->hw.enable), str_yes_no(crtc_state->hw.active));
- drm_printf(p, "\tadjusted_mode=" DRM_MODE_FMT "\n",
- DRM_MODE_ARG(&crtc_state->hw.adjusted_mode));
- drm_printf(p, "\tpipe__mode=" DRM_MODE_FMT "\n",
- DRM_MODE_ARG(&crtc_state->hw.pipe_mode));
+ drm_printf_indent(p, 1, "hw: enable=%s, active=%s\n",
+ str_yes_no(crtc_state->hw.enable), str_yes_no(crtc_state->hw.active));
+ drm_printf_indent(p, 1, "adjusted_mode=" DRM_MODE_FMT "\n",
+ DRM_MODE_ARG(&crtc_state->hw.adjusted_mode));
+ drm_printf_indent(p, 1, "pipe__mode=" DRM_MODE_FMT "\n",
+ DRM_MODE_ARG(&crtc_state->hw.pipe_mode));
- drm_printf(p, "\tpipe src=" DRM_RECT_FMT ", dither=%s, bpp=%d\n",
- DRM_RECT_ARG(&crtc_state->pipe_src),
- str_yes_no(crtc_state->dither), crtc_state->pipe_bpp);
- drm_printf(p, "\tport_clock=%d, lane_count=%d\n",
- crtc_state->port_clock, crtc_state->lane_count);
+ drm_printf_indent(p, 1, "pipe src=" DRM_RECT_FMT ", dither=%s, bpp=%d\n",
+ DRM_RECT_ARG(&crtc_state->pipe_src),
+ str_yes_no(crtc_state->dither), crtc_state->pipe_bpp);
+ drm_printf_indent(p, 1, "port_clock=%d, lane_count=%d\n",
+ crtc_state->port_clock, crtc_state->lane_count);
intel_scaler_info(p, crtc);
if (DISPLAY_VER(display) >= 9) {
u32 background = crtc_state->hw.background_color;
- drm_printf(p, "\tbackground color (10bpc XRGB2101010): %08x\n", background);
+ drm_printf_indent(p, 1, "background color (10bpc XRGB2101010): %08x\n", background);
}
if (crtc_state->joiner_pipes)
- drm_printf(p, "\tLinked to 0x%x pipes as a %s\n",
- crtc_state->joiner_pipes,
- intel_crtc_is_joiner_secondary(crtc_state) ? "slave" : "master");
+ drm_printf_indent(p, 1, "Linked to 0x%x pipes as a %s\n",
+ crtc_state->joiner_pipes,
+ intel_crtc_is_joiner_secondary(crtc_state) ? "slave" : "master");
intel_vdsc_state_dump(p, 1, crtc_state);
@@ -589,9 +589,9 @@ static void intel_crtc_info(struct drm_printer *p, struct intel_crtc *crtc)
intel_plane_info(p, crtc);
- drm_printf(p, "\tunderrun reporting: cpu=%s pch=%s\n",
- str_yes_no(!crtc->cpu_fifo_underrun_disabled),
- str_yes_no(!crtc->pch_fifo_underrun_disabled));
+ drm_printf_indent(p, 1, "underrun reporting: cpu=%s pch=%s\n",
+ str_yes_no(!crtc->cpu_fifo_underrun_disabled),
+ str_yes_no(!crtc->pch_fifo_underrun_disabled));
crtc_updates_info(p, crtc, 1);
}
--
2.47.3
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 09/13] drm/i915/debugfs: pass struct drm_printer to intel_{dp, dp_mst, hdmi}_crtc_info()
2026-10-30 12:03 ` [PATCH 09/13] drm/i915/debugfs: pass struct drm_printer to intel_{dp, dp_mst, hdmi}_crtc_info() Jani Nikula
@ 2026-10-30 12:10 ` sashiko-bot
0 siblings, 0 replies; 15+ messages in thread
From: sashiko-bot @ 2026-10-30 12:10 UTC (permalink / raw)
To: Jani Nikula, dri-devel, intel-gfx, intel-xe
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] drm/i915/debugfs: commit subject names *_crtc_info() instead of *_info()
--
commit cbb2b1bf881fc1a6e876fdc89f4b11f179ca6fee
Author: Jani Nikula <jani.nikula@intel.com>
> drm/i915/debugfs: pass struct drm_printer to intel_{dp, dp_mst, hdmi}_crtc_info()
>
> Pass struct drm_printer to intel_dp_info(), intel_dp_mst_info(), and
> intel_hdmi_info().
>
> Prefer struct drm_printer * over struct seq_file * to unify and allow
> use of drm_printer helpers.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
[Severity: Low]
This isn't a bug, but the commit subject references
intel_{dp, dp_mst, hdmi}_crtc_info() whereas the functions modified in
drivers/gpu/drm/i915/display/intel_display_debugfs.c (called from
intel_connector_info()) are intel_dp_info(), intel_dp_mst_info(), and
intel_hdmi_info(). Should the subject line refer to
intel_{dp, dp_mst, hdmi}_info() instead?
--
Sashiko AI review · https://sashiko.dev/#/patchset/cover.1793361738.git.jani.nikula@intel.com?part=9
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2026-10-30 12:10 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-10-30 12:03 [PATCH 00/13] drm/dp, drm/i915: conversions from seq_file to drm_printer Jani Nikula
2026-10-30 12:03 ` [PATCH 01/13] drm/dp: pass struct drm_printer to drm_dp_downstream_debug() Jani Nikula
2026-10-30 12:03 ` [PATCH 02/13] drm/dp: prefer drm_printf_indent() over inline \t Jani Nikula
2026-10-30 12:03 ` [PATCH 03/13] drm/i915/debugfs: pass struct drm_printer to intel_plane_info() Jani Nikula
2026-10-30 12:03 ` [PATCH 04/13] drm/i915/debugfs: pass struct drm_printer to crtc_updates_info() Jani Nikula
2026-10-30 12:03 ` [PATCH 05/13] drm/i915/debugfs: convert crtc_updates_info() to use drm_printf_indent() Jani Nikula
2026-10-30 12:03 ` [PATCH 06/13] drm/i915/debugfs: pass struct drm_printer to intel_scaler_info() Jani Nikula
2026-10-30 12:03 ` [PATCH 07/13] drm/i915/debugfs: pass struct drm_printer to intel_encoder_info() Jani Nikula
2026-10-30 12:03 ` [PATCH 08/13] drm/i915/debugfs: pass struct drm_printer to intel_crtc_info() Jani Nikula
2026-10-30 12:03 ` [PATCH 09/13] drm/i915/debugfs: pass struct drm_printer to intel_{dp, dp_mst, hdmi}_crtc_info() Jani Nikula
2026-10-30 12:10 ` sashiko-bot
2026-10-30 12:03 ` [PATCH 10/13] drm/i915/debugfs: pass struct drm_printer to intel_hdcp_info() Jani Nikula
2026-10-30 12:03 ` [PATCH 11/13] drm/i915/debugfs: refactor intel_seq_print_mode() into intel_print_mode() Jani Nikula
2026-10-30 12:03 ` [PATCH 12/13] drm/i915/debugfs: pass struct drm_printer to intel_connector_info() Jani Nikula
2026-10-30 12:03 ` [PATCH 13/13] drm/i915/debugfs: prefer drm_printf_indent() over inline \t Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox