On Fri, May 15, 2020 at 10:43 AM Ramalingam C <ramalingam.c@xxxxxxxxx> wrote: > > On 2020-04-29 at 15:55:02 -0400, Sean Paul wrote: > > From: Sean Paul <seanpaul@xxxxxxxxxxxx> > > > > Now that all the groundwork has been laid, we can turn on HDCP 1.4 over > > MST. Everything except for toggling the HDCP signalling and HDCP 2.2 > > support is the same as the DP case, so we'll re-use those callbacks > > > > Cc: Juston Li <juston.li@xxxxxxxxx> > > Signed-off-by: Sean Paul <seanpaul@xxxxxxxxxxxx> > > Link: https://patchwork.freedesktop.org/patch/msgid/20191203173638.94919-12-sean@xxxxxxxxxx #v1 > > Link: https://patchwork.freedesktop.org/patch/msgid/20191212190230.188505-13-sean@xxxxxxxxxx #v2 > > Link: https://patchwork.freedesktop.org/patch/msgid/20200117193103.156821-13-sean@xxxxxxxxxx #v3 > > Link: https://patchwork.freedesktop.org/patch/msgid/20200218220242.107265-15-sean@xxxxxxxxxx #v4 > > Link: https://patchwork.freedesktop.org/patch/msgid/20200305201236.152307-17-sean@xxxxxxxxxx #v5 > > > > Changes in v2: > > -Toggle HDCP from encoder disable/enable > > -Don't disable HDCP on MST connector destroy, leave that for encoder > > disable, just ensure the check_work routine isn't running any longer > > Changes in v3: > > -Place the shim in the new intel_dp_hdcp.c file (Ville) > > Changes in v4: > > -Actually use the mst shim for mst connections (Juston) > > -Use QUERY_STREAM_ENC_STATUS MST message to verify channel is encrypted > > Changes in v5: > > -Add sleep on disable signalling to match hdmi delay > > Changes in v6: > > -Disable HDCP over MST on GEN12+ since I'm unsure how it should work and I > > don't have hardware to test it > > --- > > drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 107 ++++++++++++++++++- > > drivers/gpu/drm/i915/display/intel_dp_mst.c | 18 ++++ > > 2 files changed, 124 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c > > index 4e3dafbea1f9..331fdb312e05 100644 > > --- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c > > +++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c > > @@ -7,10 +7,12 @@ > > */ > > > > #include <drm/drm_dp_helper.h> > > +#include <drm/drm_dp_mst_helper.h> > > #include <drm/drm_hdcp.h> > > #include <drm/drm_print.h> > > > > #include "intel_display_types.h" > > +#include "intel_ddi.h" > > #include "intel_dp.h" > > #include "intel_hdcp.h" > > > > @@ -618,6 +620,106 @@ static const struct intel_hdcp_shim intel_dp_hdcp_shim = { > > .protocol = HDCP_PROTOCOL_DP, > > }; > > > > +static int > > +intel_dp_mst_hdcp_toggle_signalling(struct intel_digital_port *intel_dig_port, > > + enum transcoder cpu_transcoder, > > + bool enable) > > +{ > > + struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev); > > + int ret; > > + > > + if (!enable) > > + usleep_range(6, 60); /* Bspec says >= 6us */ > > + > > + ret = intel_ddi_toggle_hdcp_signalling(&intel_dig_port->base, > > + cpu_transcoder, enable); > Sean, > > The bit configured here is meant for HDMI and DVI only. Ignore for DP. > Thanks anshuman for pointing that out. The bspec says "Select HDCP for the desired stream using the Pipe DDI Function Control register." this is required to get stream level encryption (confirmed via the QUERY_STREAM_ENCRYPTION_STATUS sideband message). > > + if (ret) > > + drm_dbg_kms(&i915->drm, "%s HDCP signalling failed (%d)\n", > > + enable ? "Enable" : "Disable", ret); > > + return ret; > > +} \snip > > +static const struct intel_hdcp_shim intel_dp_mst_hdcp_shim = { > > + .write_an_aksv = intel_dp_hdcp_write_an_aksv, > > + .read_bksv = intel_dp_hdcp_read_bksv, > > + .read_bstatus = intel_dp_hdcp_read_bstatus, > > + .repeater_present = intel_dp_hdcp_repeater_present, > > + .read_ri_prime = intel_dp_hdcp_read_ri_prime, > > + .read_ksv_ready = intel_dp_hdcp_read_ksv_ready, > > + .read_ksv_fifo = intel_dp_hdcp_read_ksv_fifo, > > + .read_v_prime_part = intel_dp_hdcp_read_v_prime_part, > > + .toggle_signalling = intel_dp_mst_hdcp_toggle_signalling, > > + .check_link = intel_dp_mst_hdcp_check_link, > > + .hdcp_capable = intel_dp_hdcp_capable, > > + > > + .write_2_2_msg = intel_dp_mst_hdcp2_write_msg, > > + .read_2_2_msg = intel_dp_mst_hdcp2_read_msg, > > + .config_stream_type = intel_dp_mst_hdcp2_config_stream_type, > > + .check_2_2_link = intel_dp_mst_hdcp2_check_link, > > + .hdcp_2_2_capable = intel_dp_mst_hdcp2_capable, > IMO, we dont need to introduce dummy functions for HDCP2.2 on MST shim, > when we are not enabling HDCP2.2 on it. > > At is_hdcp2_supported() just add > if (connector->mst_port) > return false; Ok, will do. > > + > > + .protocol = HDCP_PROTOCOL_DP, > > +}; > > + \snip > > + > > + /* Enable hdcp if it's desired */ > > + if (conn_state->content_protection == > > + DRM_MODE_CONTENT_PROTECTION_DESIRED) > > + intel_hdcp_enable(to_intel_connector(conn_state->connector), > > + pipe_config->cpu_transcoder, > > + (u8)conn_state->hdcp_content_type); > > I am afraid I am not seeing the stream level HDCP encryption set > anywhere. How the userspace will indicate the streams that needs to be > hdcp encrypted? > See above. Stream level encryption is achieved via the toggle_hdcp_signalling above (that's why it's needed). Sean > Thanks, > -Ram > > } > > > > static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder, > > @@ -748,6 +758,14 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo > > intel_attach_force_audio_property(connector); > > intel_attach_broadcast_rgb_property(connector); > > > > + > > + /* TODO: Figure out how to make HDCP work on GEN12+ */ > > + if (INTEL_GEN(dev_priv) < 12) { > > + ret = intel_dp_init_hdcp(intel_dig_port, intel_connector); > > + if (ret) > > + DRM_DEBUG_KMS("HDCP init failed, skipping.\n"); > > + } > > + > > /* > > * Reuse the prop from the SST connector because we're > > * not allowed to create new props after device registration. > > -- > > Sean Paul, Software Engineer, Google / Chromium OS > > _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
