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