[PATCH v8 00/35] drm/i915: Implement HDCP2.2

Daniel Vetter daniel at ffwll.ch
Thu Dec 6 14:27:17 UTC 2018


On Tue, Nov 27, 2018 at 04:12:58PM +0530, Ramalingam C wrote:
> This series enables the HDCP2.2 for I915. The sequence for HDCP2.2
> authentication and encryption is implemented as a generic flow
> between HDMI and DP. Encoder specific implementations are moved
> into hdcp_shim.
> 
> Intel HWs supports HDCP2.2 through ME FW. Hence this series
> introduces a client driver for mei bus, so that for HDCP2.2
> authentication, HDCP2.2 stack in I915 can avail the services from
> ME FW. To enable this client driver set the config variable
> CONFIG_INTEL_MEI_HDCP.
> 
> Userspace interface remains unchanged as version agnostic. When
> userspace request for HDCP enable, Kernel will detect the HDCP source
> and sink's HDCP version(1.4/2.2)capability and enable the best capable
> version for that combination.
> 
> This series enables the HDCP2.2 for Type0 content strams.
> 
> Major changes in v8:
>   - Mei_hdcp component binding status will impact HDCP2.2 alone.

Oh now I see why component side looked so totally different than the old
series. That's not how component works, and essentially we're back to
rolling all the synchronization ourselves.

If you have an optional component, you need to decide whether you want it
at component_match_add time: Either add the component as a match, or not.
All the other stuff needs to stay the same.

That also explains why I didn't find the special audio component
registration hack anymore. I think for the unload side we need to make the
symmetrical hack, i.e. unregister the audio component from the pci unload
function, not from component_master_unbind. To avoid the locking
recursion.

The proper fix for the recursion should be easy, we just need to add
_locked version of component functions called for the audio component,
which check that the component lock is already taken (like
component_bind_all and friends already do to break the recursion in other
places).
-Daniel

>   - hdcp2_check_work is cancelled only when hdcp2 is supported.
>   - Errors due to sinks are reported as DEBUG logs.
>   - HDCP2.2 auth will be attempted only if the mei_hdcp interface is up.
>   - Maintainability ease MEI i/f changes are gathered in single patch.
>   - intel_hdcp_exit is defined and used.
> 
> To ease the review process, series is hosted at
> https://github.com/ramalingampc2008/drm-tip.git hdcp2_2_v8
> 
> Ramalingam C (33):
>   drm/i915: debug log for REPLY_ACK missing
>   drm/i915: Increase timeout for Encrypt status change
>   linux/mei: Header for mei_hdcp driver interface
>   drm/i915: Initialize HDCP2.2
>   drm/i915: MEI interface definition
>   drm/i915: Enable and Disable of HDCP2.2
>   drm/i915: Implement HDCP2.2 receiver authentication
>   drm/i915: Implement HDCP2.2 repeater authentication
>   drm/i915: Implement HDCP2.2 link integrity check
>   drm/i915: Handle HDCP2.2 downstream topology change
>   drm/i915: Check HDCP 1.4 and 2.2 link on CP_IRQ
>   drm/i915: Implement the HDCP2.2 support for DP
>   drm/i915: Implement the HDCP2.2 support for HDMI
>   drm/i915: Add HDCP2.2 support for DP connectors
>   drm/i915: Add HDCP2.2 support for HDMI connectors
>   misc/mei/hdcp: Client driver for HDCP application
>   misc/mei/hdcp: Define ME FW interface for HDCP2.2
>   misc/mei/hdcp: Initiate Wired HDCP2.2 Tx Session
>   misc/mei/hdcp: Verify Receiver Cert and prepare km
>   misc/mei/hdcp: Verify H_prime
>   misc/mei/hdcp: Store the HDCP Pairing info
>   misc/mei/hdcp: Initiate Locality check
>   misc/mei/hdcp: Verify L_prime
>   misc/mei/hdcp: Prepare Session Key
>   misc/mei/hdcp: Repeater topology verification and ack
>   misc/mei/hdcp: Verify M_prime
>   misc/mei/hdcp: Enabling the HDCP authentication
>   misc/mei/hdcp: Closing wired HDCP2.2 Tx Session
>   misc/mei/hdcp: Component framework for I915 Interface
>   drm/i915: Commit CP without modeset
>   drm/i915: Fix KBL HDCP2.2 encrypt status signalling
>   FOR_TEST: i915/Kconfig: Select mei_hdcp by I915
>   FOR_TESTING_ONLY: debugfs: Excluding the LSPCon for HDCP1.4
> 
> Tomas Winkler (2):
>   mei: bus: whitelist hdcp client
>   mei: bus: export to_mei_cl_device for mei client device drivers
> 
>  MAINTAINERS                          |    1 +
>  drivers/gpu/drm/i915/i915_debugfs.c  |   10 +-
>  drivers/gpu/drm/i915/i915_drv.c      |    2 +
>  drivers/gpu/drm/i915/i915_drv.h      |    2 +
>  drivers/gpu/drm/i915/intel_ddi.c     |    7 -
>  drivers/gpu/drm/i915/intel_display.c |   21 +-
>  drivers/gpu/drm/i915/intel_dp.c      |  349 ++++++++-
>  drivers/gpu/drm/i915/intel_drv.h     |   81 +-
>  drivers/gpu/drm/i915/intel_hdcp.c    | 1390 +++++++++++++++++++++++++++++++---
>  drivers/gpu/drm/i915/intel_hdmi.c    |  193 ++++-
>  drivers/misc/mei/Kconfig             |    8 +
>  drivers/misc/mei/Makefile            |    2 +
>  drivers/misc/mei/bus-fixup.c         |   16 +
>  drivers/misc/mei/bus.c               |    1 -
>  drivers/misc/mei/hdcp/Makefile       |    7 +
>  drivers/misc/mei/hdcp/mei_hdcp.c     |  825 ++++++++++++++++++++
>  drivers/misc/mei/hdcp/mei_hdcp.h     |  366 +++++++++
>  include/drm/drm_hdcp.h               |   23 +
>  include/drm/i915_component.h         |   71 ++
>  include/linux/mei_cl_bus.h           |    2 +
>  include/linux/mei_hdcp.h             |   91 +++
>  21 files changed, 3340 insertions(+), 128 deletions(-)
>  create mode 100644 drivers/misc/mei/hdcp/Makefile
>  create mode 100644 drivers/misc/mei/hdcp/mei_hdcp.c
>  create mode 100644 drivers/misc/mei/hdcp/mei_hdcp.h
>  create mode 100644 include/linux/mei_hdcp.h
> 
> -- 
> 2.7.4
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the dri-devel mailing list