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 <[email protected]> --- 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
