Re: [PATCH v3 01/10] drm/i915: debugfs: HDCP2.2 capability read

Daniel Vetter
2019-03-27T09:51:40Z

On Fri, Mar 22, 2019 at 06:14:39AM +0530, Ramalingam C wrote:
> Adding the HDCP2.2 capability of HDCP src and sink info into debugfs
> entry "i915_hdcp_sink_capability"
>
> This helps the userspace tests to skip the HDCP2.2 test on non HDCP2.2
> sinks.
>
> Signed-off-by: Ramalingam C <ramalingam.c@intel.com>

Still not a fan of exposing stuff to debugfs, but can't really do better.

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

> ---
> drivers/gpu/drm/i915/i915_debugfs.c | 13 +++++++++++--
> drivers/gpu/drm/i915/intel_drv.h | 1 +
> drivers/gpu/drm/i915/intel_hdcp.c | 2 +-
> 3 files changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 08683dca7775..912f30e8e01a 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -4751,6 +4751,7 @@ static int i915_hdcp_sink_capability_show(struct seq_file *m, void *data)
> {
> struct drm_connector *connector = m->private;
> struct intel_connector *intel_connector = to_intel_connector(connector);
> + bool hdcp_cap, hdcp2_cap;
>
> if (connector->status != connector_status_connected)
> return -ENODEV;
> @@ -4761,8 +4762,16 @@ static int i915_hdcp_sink_capability_show(struct seq_file *m, void *data)
>
> seq_printf(m, "%s:%d HDCP version: ", connector->name,
> connector->base.id);
> - seq_printf(m, "%s ", !intel_hdcp_capable(intel_connector) ?
> - "None" : "HDCP1.4");
> + hdcp_cap = intel_hdcp_capable(intel_connector);
> + hdcp2_cap = intel_hdcp2_capable(intel_connector);
> +
> + if (hdcp_cap)
> + seq_puts(m, "HDCP1.4 ");
> + if (hdcp2_cap)
> + seq_puts(m, "HDCP2.2 ");
> +
> + if (!hdcp_cap && !hdcp2_cap)
> + seq_puts(m, "None");
> seq_puts(m, "\n");
>
> return 0;
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 4d7ae579fc92..a37a4477994c 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -2182,6 +2182,7 @@ int intel_hdcp_enable(struct intel_connector *connector);
> int intel_hdcp_disable(struct intel_connector *connector);
> bool is_hdcp_supported(struct drm_i915_private *dev_priv, enum port port);
> bool intel_hdcp_capable(struct intel_connector *connector);
> +bool intel_hdcp2_capable(struct intel_connector *connector);
> void intel_hdcp_component_init(struct drm_i915_private *dev_priv);
> void intel_hdcp_component_fini(struct drm_i915_private *dev_priv);
> void intel_hdcp_cleanup(struct intel_connector *connector);
> diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c
> index 9ce09f67776d..ff9497e5c591 100644
> --- a/drivers/gpu/drm/i915/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/intel_hdcp.c
> @@ -76,7 +76,7 @@ bool intel_hdcp_capable(struct intel_connector *connector)
> }
>
> /* Is HDCP2.2 capable on Platform and Sink */
> -static bool intel_hdcp2_capable(struct intel_connector *connector)
> +bool intel_hdcp2_capable(struct intel_connector *connector)
> {
> struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_digital_port *intel_dig_port = conn_to_dig_port(connector);
> --
> 2.19.1
>

--
Daniel Vetter
Software Engineer, Intel Corporation