diff mbox

[v6,09/35] drm/i915: Initialize HDCP2.2 and its MEI interface

Message ID 1531538117-1606-10-git-send-email-ramalingam.c@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ramalingam C July 14, 2018, 3:14 a.m. UTC
Initialize HDCP2.2 support. This includes the mei interface
initialization along with required component registration.

v2:
  mei interface handle is protected with mutex. [Chris Wilson]
v3:
  Notifiers are used for the mei interface state.
v4:
  Poll for mei client device state
  Error msg for out of mem [Uma]
  Inline req for init function removed [Uma]
v5:
  Rebase as Part of reordering.
  Component is used for the I915 and MEI_HDCP interface [Daniel]
v6:
  HDCP2.2 uses the I915 component master to communicate with mei_hdcp
	- [Daniel]
  Required HDCP2.2 variables defined [Sean Paul]

Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
---
 drivers/gpu/drm/i915/intel_dp.c   |  3 +-
 drivers/gpu/drm/i915/intel_drv.h  | 23 +++++++++++-
 drivers/gpu/drm/i915/intel_hdcp.c | 77 ++++++++++++++++++++++++++++++++++++++-
 drivers/gpu/drm/i915/intel_hdmi.c |  2 +-
 include/drm/i915_component.h      | 60 ++++++++++++++++++++++++++++++
 5 files changed, 161 insertions(+), 4 deletions(-)

Comments

kernel test robot July 17, 2018, 1:29 a.m. UTC | #1
Hi Ramalingam,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on v4.18-rc4 next-20180713]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Ramalingam-C/drm-i915-Implement-HDCP2-2/20180714-204349
base:   git://anongit.freedesktop.org/drm-intel for-linux-next
reproduce: make htmldocs
:::::: branch date: 5 hours ago
:::::: commit date: 5 hours ago

All warnings (new ones prefixed by >>):

   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   include/net/mac80211.h:2083: warning: bad line: >
   net/mac80211/sta_info.h:586: warning: Function parameter or member 'rx_stats_avg' not described in 'sta_info'
   net/mac80211/sta_info.h:586: warning: Function parameter or member 'rx_stats_avg.signal' not described in 'sta_info'
   net/mac80211/sta_info.h:586: warning: Function parameter or member 'rx_stats_avg.chain_signal' not described in 'sta_info'
   net/mac80211/sta_info.h:586: warning: Function parameter or member 'status_stats.filtered' not described in 'sta_info'
   net/mac80211/sta_info.h:586: warning: Function parameter or member 'status_stats.retry_failed' not described in 'sta_info'
   net/mac80211/sta_info.h:586: warning: Function parameter or member 'status_stats.retry_count' not described in 'sta_info'
   net/mac80211/sta_info.h:586: warning: Function parameter or member 'status_stats.lost_packets' not described in 'sta_info'
   net/mac80211/sta_info.h:586: warning: Function parameter or member 'status_stats.last_tdls_pkt_time' not described in 'sta_info'
   net/mac80211/sta_info.h:586: warning: Function parameter or member 'status_stats.msdu_retries' not described in 'sta_info'
   net/mac80211/sta_info.h:586: warning: Function parameter or member 'status_stats.msdu_failed' not described in 'sta_info'
   net/mac80211/sta_info.h:586: warning: Function parameter or member 'status_stats.last_ack' not described in 'sta_info'
   net/mac80211/sta_info.h:586: warning: Function parameter or member 'status_stats.last_ack_signal' not described in 'sta_info'
   net/mac80211/sta_info.h:586: warning: Function parameter or member 'status_stats.ack_signal_filled' not described in 'sta_info'
   net/mac80211/sta_info.h:586: warning: Function parameter or member 'tx_stats.packets' not described in 'sta_info'
   net/mac80211/sta_info.h:586: warning: Function parameter or member 'tx_stats.bytes' not described in 'sta_info'
   net/mac80211/sta_info.h:586: warning: Function parameter or member 'tx_stats.last_rate' not described in 'sta_info'
   net/mac80211/sta_info.h:586: warning: Function parameter or member 'tx_stats.msdu' not described in 'sta_info'
   kernel/sched/fair.c:3731: warning: Function parameter or member 'flags' not described in 'attach_entity_load_avg'
   include/linux/dma-buf.h:307: warning: Function parameter or member 'cb_excl.cb' not described in 'dma_buf'
   include/linux/dma-buf.h:307: warning: Function parameter or member 'cb_excl.poll' not described in 'dma_buf'
   include/linux/dma-buf.h:307: warning: Function parameter or member 'cb_excl.active' not described in 'dma_buf'
   include/linux/dma-buf.h:307: warning: Function parameter or member 'cb_shared.cb' not described in 'dma_buf'
   include/linux/dma-buf.h:307: warning: Function parameter or member 'cb_shared.poll' not described in 'dma_buf'
   include/linux/dma-buf.h:307: warning: Function parameter or member 'cb_shared.active' not described in 'dma_buf'
   include/linux/dma-fence-array.h:54: warning: Function parameter or member 'work' not described in 'dma_fence_array'
   include/linux/gpio/driver.h:142: warning: Function parameter or member 'request_key' not described in 'gpio_irq_chip'
   include/linux/iio/iio.h:270: warning: Function parameter or member 'scan_type.sign' not described in 'iio_chan_spec'
   include/linux/iio/iio.h:270: warning: Function parameter or member 'scan_type.realbits' not described in 'iio_chan_spec'
   include/linux/iio/iio.h:270: warning: Function parameter or member 'scan_type.storagebits' not described in 'iio_chan_spec'
   include/linux/iio/iio.h:270: warning: Function parameter or member 'scan_type.shift' not described in 'iio_chan_spec'
   include/linux/iio/iio.h:270: warning: Function parameter or member 'scan_type.repeat' not described in 'iio_chan_spec'
   include/linux/iio/iio.h:270: warning: Function parameter or member 'scan_type.endianness' not described in 'iio_chan_spec'
   include/linux/iio/hw-consumer.h:1: warning: no structured comments found
   include/linux/input/sparse-keymap.h:46: warning: Function parameter or member 'sw' not described in 'key_entry'
   include/linux/mtd/rawnand.h:752: warning: Function parameter or member 'timings.sdr' not described in 'nand_data_interface'
   include/linux/mtd/rawnand.h:817: warning: Function parameter or member 'buf' not described in 'nand_op_data_instr'
   include/linux/mtd/rawnand.h:817: warning: Function parameter or member 'buf.in' not described in 'nand_op_data_instr'
   include/linux/mtd/rawnand.h:817: warning: Function parameter or member 'buf.out' not described in 'nand_op_data_instr'
   include/linux/mtd/rawnand.h:863: warning: Function parameter or member 'ctx' not described in 'nand_op_instr'
   include/linux/mtd/rawnand.h:863: warning: Function parameter or member 'ctx.cmd' not described in 'nand_op_instr'
   include/linux/mtd/rawnand.h:863: warning: Function parameter or member 'ctx.addr' not described in 'nand_op_instr'
   include/linux/mtd/rawnand.h:863: warning: Function parameter or member 'ctx.data' not described in 'nand_op_instr'
   include/linux/mtd/rawnand.h:863: warning: Function parameter or member 'ctx.waitrdy' not described in 'nand_op_instr'
   include/linux/mtd/rawnand.h:1010: warning: Function parameter or member 'ctx' not described in 'nand_op_parser_pattern_elem'
   include/linux/mtd/rawnand.h:1010: warning: Function parameter or member 'ctx.addr' not described in 'nand_op_parser_pattern_elem'
   include/linux/mtd/rawnand.h:1010: warning: Function parameter or member 'ctx.data' not described in 'nand_op_parser_pattern_elem'
   include/linux/mtd/rawnand.h:1313: warning: Function parameter or member 'manufacturer.desc' not described in 'nand_chip'
   include/linux/mtd/rawnand.h:1313: warning: Function parameter or member 'manufacturer.priv' not described in 'nand_chip'
   include/linux/regulator/driver.h:222: warning: Function parameter or member 'resume_early' not described in 'regulator_ops'
   drivers/regulator/core.c:4306: warning: Excess function parameter 'state' description in 'regulator_suspend_late'
   arch/s390/include/asm/cio.h:245: warning: Function parameter or member 'esw.esw0' not described in 'irb'
   arch/s390/include/asm/cio.h:245: warning: Function parameter or member 'esw.esw1' not described in 'irb'
   arch/s390/include/asm/cio.h:245: warning: Function parameter or member 'esw.esw2' not described in 'irb'
   arch/s390/include/asm/cio.h:245: warning: Function parameter or member 'esw.esw3' not described in 'irb'
   arch/s390/include/asm/cio.h:245: warning: Function parameter or member 'esw.eadm' not described in 'irb'
   drivers/usb/typec/mux.c:186: warning: Function parameter or member 'mux' not described in 'typec_mux_unregister'
   drivers/usb/typec/mux.c:186: warning: Excess function parameter 'sw' description in 'typec_mux_unregister'
   include/drm/drm_drv.h:610: warning: Function parameter or member 'gem_prime_pin' not described in 'drm_driver'
   include/drm/drm_drv.h:610: warning: Function parameter or member 'gem_prime_unpin' not described in 'drm_driver'
   include/drm/drm_drv.h:610: warning: Function parameter or member 'gem_prime_res_obj' not described in 'drm_driver'
   include/drm/drm_drv.h:610: warning: Function parameter or member 'gem_prime_get_sg_table' not described in 'drm_driver'
   include/drm/drm_drv.h:610: warning: Function parameter or member 'gem_prime_import_sg_table' not described in 'drm_driver'
   include/drm/drm_drv.h:610: warning: Function parameter or member 'gem_prime_vmap' not described in 'drm_driver'
   include/drm/drm_drv.h:610: warning: Function parameter or member 'gem_prime_vunmap' not described in 'drm_driver'
   include/drm/drm_drv.h:610: warning: Function parameter or member 'gem_prime_mmap' not described in 'drm_driver'
>> include/drm/i915_component.h:199: warning: Function parameter or member 'hdcp_ops' not described in 'i915_component_master'
   drivers/gpu/drm/i915/i915_vma.h:49: warning: cannot understand function prototype: 'struct i915_vma '
   drivers/gpu/drm/i915/i915_vma.h:1: warning: no structured comments found
   drivers/gpu/drm/i915/intel_guc_fwif.h:553: warning: cannot understand function prototype: 'struct guc_log_buffer_state '
   drivers/gpu/drm/i915/i915_trace.h:1: warning: no structured comments found
   include/drm/tinydrm/tinydrm.h:34: warning: Function parameter or member 'fb_dirty' not described in 'tinydrm_device'
   drivers/gpu/drm/tinydrm/mipi-dbi.c:272: warning: Function parameter or member 'crtc_state' not described in 'mipi_dbi_enable_flush'
   drivers/gpu/drm/tinydrm/mipi-dbi.c:272: warning: Function parameter or member 'plane_state' not described in 'mipi_dbi_enable_flush'
   include/media/v4l2-dev.h:42: warning: Enum value 'VFL_TYPE_MAX' not described in enum 'vfl_devnode_type'
   include/linux/skbuff.h:850: warning: Function parameter or member 'dev_scratch' not described in 'sk_buff'
   include/linux/skbuff.h:850: warning: Function parameter or member 'ip_defrag_offset' not described in 'sk_buff'
   include/linux/skbuff.h:850: warning: Function parameter or member 'skb_mstamp' not described in 'sk_buff'
   include/linux/skbuff.h:850: warning: Function parameter or member '__cloned_offset' not described in 'sk_buff'
   include/linux/skbuff.h:850: warning: Function parameter or member 'head_frag' not described in 'sk_buff'
   include/linux/skbuff.h:850: warning: Function parameter or member '__unused' not described in 'sk_buff'
   include/linux/skbuff.h:850: warning: Function parameter or member '__pkt_type_offset' not described in 'sk_buff'
   include/linux/skbuff.h:850: warning: Function parameter or member 'pfmemalloc' not described in 'sk_buff'
   include/linux/skbuff.h:850: warning: Function parameter or member 'encapsulation' not described in 'sk_buff'
   include/linux/skbuff.h:850: warning: Function parameter or member 'encap_hdr_csum' not described in 'sk_buff'
   include/linux/skbuff.h:850: warning: Function parameter or member 'csum_valid' not described in 'sk_buff'
   include/linux/skbuff.h:850: warning: Function parameter or member 'csum_complete_sw' not described in 'sk_buff'
   include/linux/skbuff.h:850: warning: Function parameter or member 'csum_level' not described in 'sk_buff'
   include/linux/skbuff.h:850: warning: Function parameter or member 'inner_protocol_type' not described in 'sk_buff'
   include/linux/skbuff.h:850: warning: Function parameter or member 'remcsum_offload' not described in 'sk_buff'
   include/linux/skbuff.h:850: warning: Function parameter or member 'offload_fwd_mark' not described in 'sk_buff'
   include/linux/skbuff.h:850: warning: Function parameter or member 'offload_mr_fwd_mark' not described in 'sk_buff'
   include/linux/skbuff.h:850: warning: Function parameter or member 'sender_cpu' not described in 'sk_buff'
   include/linux/skbuff.h:850: warning: Function parameter or member 'reserved_tailroom' not described in 'sk_buff'
   include/linux/skbuff.h:850: warning: Function parameter or member 'inner_ipproto' not described in 'sk_buff'
   include/net/sock.h:234: warning: Function parameter or member 'skc_addrpair' not described in 'sock_common'
   include/net/sock.h:234: warning: Function parameter or member 'skc_portpair' not described in 'sock_common'
   include/net/sock.h:234: warning: Function parameter or member 'skc_ipv6only' not described in 'sock_common'
   include/net/sock.h:234: warning: Function parameter or member 'skc_net_refcnt' not described in 'sock_common'
   include/net/sock.h:234: warning: Function parameter or member 'skc_v6_daddr' not described in 'sock_common'
   include/net/sock.h:234: warning: Function parameter or member 'skc_v6_rcv_saddr' not described in 'sock_common'
   include/net/sock.h:234: warning: Function parameter or member 'skc_cookie' not described in 'sock_common'
   include/net/sock.h:234: warning: Function parameter or member 'skc_listener' not described in 'sock_common'
   include/net/sock.h:234: warning: Function parameter or member 'skc_tw_dr' not described in 'sock_common'
   include/net/sock.h:234: warning: Function parameter or member 'skc_rcv_wnd' not described in 'sock_common'
   include/net/sock.h:234: warning: Function parameter or member 'skc_tw_rcv_nxt' not described in 'sock_common'
   include/net/sock.h:488: warning: Function parameter or member 'sk_backlog.rmem_alloc' not described in 'sock'
   include/net/sock.h:488: warning: Function parameter or member 'sk_backlog.len' not described in 'sock'
   include/net/sock.h:488: warning: Function parameter or member 'sk_backlog.head' not described in 'sock'
   include/net/sock.h:488: warning: Function parameter or member 'sk_backlog.tail' not described in 'sock'
   include/net/sock.h:488: warning: Function parameter or member 'sk_wq_raw' not described in 'sock'
   include/net/sock.h:488: warning: Function parameter or member 'tcp_rtx_queue' not described in 'sock'
   include/net/sock.h:488: warning: Function parameter or member 'sk_route_forced_caps' not described in 'sock'
   include/linux/netdevice.h:1955: warning: Function parameter or member 'adj_list.upper' not described in 'net_device'
   include/linux/netdevice.h:1955: warning: Function parameter or member 'adj_list.lower' not described in 'net_device'
   include/linux/netdevice.h:1955: warning: Function parameter or member 'gso_partial_features' not described in 'net_device'
   include/linux/netdevice.h:1955: warning: Function parameter or member 'switchdev_ops' not described in 'net_device'
   include/linux/netdevice.h:1955: warning: Function parameter or member 'l3mdev_ops' not described in 'net_device'
   include/linux/netdevice.h:1955: warning: Function parameter or member 'xfrmdev_ops' not described in 'net_device'
   include/linux/netdevice.h:1955: warning: Function parameter or member 'name_assign_type' not described in 'net_device'
   include/linux/netdevice.h:1955: warning: Function parameter or member 'ieee802154_ptr' not described in 'net_device'
   include/linux/netdevice.h:1955: warning: Function parameter or member 'mpls_ptr' not described in 'net_device'
   include/linux/netdevice.h:1955: warning: Function parameter or member 'xdp_prog' not described in 'net_device'
   include/linux/netdevice.h:1955: warning: Function parameter or member 'gro_flush_timeout' not described in 'net_device'
   include/linux/netdevice.h:1955: warning: Function parameter or member 'nf_hooks_ingress' not described in 'net_device'
   include/linux/netdevice.h:1955: warning: Function parameter or member '____cacheline_aligned_in_smp' not described in 'net_device'
   include/linux/netdevice.h:1955: warning: Function parameter or member 'qdisc_hash' not described in 'net_device'
   include/linux/phylink.h:56: warning: Function parameter or member '__ETHTOOL_DECLARE_LINK_MODE_MASK(advertising' not described in 'phylink_link_state'
   include/linux/phylink.h:56: warning: Function parameter or member '__ETHTOOL_DECLARE_LINK_MODE_MASK(lp_advertising' not described in 'phylink_link_state'
   include/linux/rcupdate.h:572: ERROR: Unexpected indentation.
   include/linux/rcupdate.h:576: ERROR: Unexpected indentation.
   include/linux/rcupdate.h:580: WARNING: Block quote ends without a blank line; unexpected unindent.
   include/linux/rcupdate.h:582: WARNING: Block quote ends without a blank line; unexpected unindent.
   include/linux/rcupdate.h:582: WARNING: Inline literal start-string without end-string.
   Documentation/crypto/crypto_engine.rst:13: ERROR: Unexpected indentation.
   Documentation/crypto/crypto_engine.rst:15: WARNING: Block quote ends without a blank line; unexpected unindent.
   kernel/time/timer.c:1259: ERROR: Unexpected indentation.
   kernel/time/timer.c:1261: ERROR: Unexpected indentation.
   kernel/time/timer.c:1262: WARNING: Block quote ends without a blank line; unexpected unindent.
   include/linux/wait.h:110: WARNING: Block quote ends without a blank line; unexpected unindent.
   include/linux/wait.h:113: ERROR: Unexpected indentation.
   include/linux/wait.h:115: WARNING: Block quote ends without a blank line; unexpected unindent.
   kernel/time/hrtimer.c:1129: WARNING: Block quote ends without a blank line; unexpected unindent.
   kernel/signal.c:327: WARNING: Inline literal start-string without end-string.
   Documentation/driver-api/device_connection.rst:42: ERROR: Error in "kernel-doc" directive:
   maximum 4 argument(s) allowed, 7 supplied.

# https://github.com/0day-ci/linux/commit/fb42fe2c2fb9129e7bde0fef8ce52461cc39d707
git remote add linux-review https://github.com/0day-ci/linux
git remote update linux-review
git checkout fb42fe2c2fb9129e7bde0fef8ce52461cc39d707
vim +199 include/drm/i915_component.h

e0fa171b Ramalingam C 2018-07-14 @199  

:::::: The code at line 199 was first introduced by commit
:::::: e0fa171b1e16ce29bebc8a289bb4676284ac066f drm/i915: component master at i915 driver load

:::::: TO: Ramalingam C <ramalingam.c@intel.com>
:::::: CC: 0day robot <lkp@intel.com>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
Shankar, Uma July 31, 2018, 7:41 p.m. UTC | #2
>-----Original Message-----
>From: C, Ramalingam
>Sent: Saturday, July 14, 2018 8:45 AM
>To: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org;
>daniel@ffwll.ch; seanpaul@chromium.org; Winkler, Tomas
><tomas.winkler@intel.com>; Usyskin, Alexander <alexander.usyskin@intel.com>;
>Shankar, Uma <uma.shankar@intel.com>
>Cc: Sharma, Shashank <shashank.sharma@intel.com>; C, Ramalingam
><ramalingam.c@intel.com>
>Subject: [PATCH v6 09/35] drm/i915: Initialize HDCP2.2 and its MEI interface
>
>Initialize HDCP2.2 support. This includes the mei interface initialization along with
>required component registration.
>
>v2:
>  mei interface handle is protected with mutex. [Chris Wilson]
>v3:
>  Notifiers are used for the mei interface state.
>v4:
>  Poll for mei client device state
>  Error msg for out of mem [Uma]
>  Inline req for init function removed [Uma]
>v5:
>  Rebase as Part of reordering.
>  Component is used for the I915 and MEI_HDCP interface [Daniel]
>v6:
>  HDCP2.2 uses the I915 component master to communicate with mei_hdcp
>	- [Daniel]
>  Required HDCP2.2 variables defined [Sean Paul]
>
>Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
>---
> drivers/gpu/drm/i915/intel_dp.c   |  3 +-
> drivers/gpu/drm/i915/intel_drv.h  | 23 +++++++++++-
>drivers/gpu/drm/i915/intel_hdcp.c | 77
>++++++++++++++++++++++++++++++++++++++-
> drivers/gpu/drm/i915/intel_hdmi.c |  2 +-
> include/drm/i915_component.h      | 60 ++++++++++++++++++++++++++++++
> 5 files changed, 161 insertions(+), 4 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>index 5be07e1d816d..12eb5bd33b7e 100644
>--- a/drivers/gpu/drm/i915/intel_dp.c
>+++ b/drivers/gpu/drm/i915/intel_dp.c
>@@ -6406,7 +6406,8 @@ intel_dp_init_connector(struct intel_digital_port
>*intel_dig_port,
> 	intel_dp_add_properties(intel_dp, connector);
>
> 	if (is_hdcp_supported(dev_priv, port) && !intel_dp_is_edp(intel_dp)) {
>-		int ret = intel_hdcp_init(intel_connector, &intel_dp_hdcp_shim);
>+		int ret = intel_hdcp_init(intel_connector, &intel_dp_hdcp_shim,
>+					  false);
> 		if (ret)
> 			DRM_DEBUG_KMS("HDCP init failed, skipping.\n");
> 	}
>diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
>index c32665136d5d..38262792813a 100644
>--- a/drivers/gpu/drm/i915/intel_drv.h
>+++ b/drivers/gpu/drm/i915/intel_drv.h
>@@ -29,6 +29,7 @@
> #include <linux/i2c.h>
> #include <linux/hdmi.h>
> #include <linux/sched/clock.h>
>+#include <linux/mei_hdcp.h>
> #include <drm/i915_drm.h>
> #include "i915_drv.h"
> #include <drm/drm_crtc.h>
>@@ -376,6 +377,9 @@ struct intel_hdcp_shim {
> 	/* Detects panel's hdcp capability. This is optional for HDMI. */
> 	int (*hdcp_capable)(struct intel_digital_port *intel_dig_port,
> 			    bool *hdcp_capable);
>+
>+	/* Detects the HDCP protocol(DP/HDMI) required on the port */
>+	enum hdcp_protocol (*hdcp_protocol)(void);
> };
>
> struct intel_hdcp {
>@@ -385,6 +389,20 @@ struct intel_hdcp {
> 	uint64_t value;
> 	struct delayed_work check_work;
> 	struct work_struct prop_work;
>+
>+	/* HDCP2.2 related definitions */
>+	/* Flag indicates whether this connector supports HDCP2.2 or not. */
>+	bool hdcp2_supported;
>+
>+	/*
>+	 * Content Stream Type defined by content owner. TYPE0(0x0) content
>can
>+	 * flow in the link protected by HDCP2.2 or HDCP1.4, where as
>TYPE1(0x1)
>+	 * content can flow only through a link protected by HDCP2.2.
>+	 */
>+	u8 content_type;
>+
>+	/* mei interface related information */
>+	struct mei_hdcp_data mei_data;
> };
>
> struct intel_connector {
>@@ -1903,11 +1921,14 @@ void intel_hdcp_atomic_check(struct
>drm_connector *connector,
> 			     struct drm_connector_state *old_state,
> 			     struct drm_connector_state *new_state);  int
>intel_hdcp_init(struct intel_connector *connector,
>-		    const struct intel_hdcp_shim *hdcp_shim);
>+		    const struct intel_hdcp_shim *hdcp_shim,
>+		    bool hdcp2_supported);
> int intel_hdcp_enable(struct intel_connector *connector);  int
>intel_hdcp_disable(struct intel_connector *connector);  int
>intel_hdcp_check_link(struct intel_connector *connector);  bool
>is_hdcp_supported(struct drm_i915_private *dev_priv, enum port port);
>+int intel_hdcp_component_init(struct drm_i915_private *dev_priv); bool
>+is_hdcp2_supported(struct drm_i915_private *dev_priv);
>
> /* intel_psr.c */
> #define CAN_PSR(dev_priv) (HAS_PSR(dev_priv) && dev_priv->psr.sink_support)
>diff --git a/drivers/gpu/drm/i915/intel_hdcp.c
>b/drivers/gpu/drm/i915/intel_hdcp.c
>index 55bc4d423187..cfe915c3f336 100644
>--- a/drivers/gpu/drm/i915/intel_hdcp.c
>+++ b/drivers/gpu/drm/i915/intel_hdcp.c
>@@ -8,13 +8,19 @@
>
> #include <drm/drmP.h>
> #include <drm/drm_hdcp.h>
>+#include <drm/i915_component.h>
> #include <linux/i2c.h>
> #include <linux/random.h>
>+#include <linux/component.h>
>
> #include "intel_drv.h"
> #include "i915_reg.h"
>
> #define KEY_LOAD_TRIES	5
>+#define GET_MEI_DDI_INDEX(port)		(((port) == PORT_A) ? DDI_A : \
>+					 (enum hdcp_physical_port)(port))
>+
>+static int intel_hdcp2_init(struct intel_connector *connector);
>
> static int intel_hdcp_poll_ksv_fifo(struct intel_digital_port *intel_dig_port,
> 				    const struct intel_hdcp_shim *shim) @@ -
>744,11 +750,15 @@ bool is_hdcp_supported(struct drm_i915_private *dev_priv,
>enum port port)  }
>
> int intel_hdcp_init(struct intel_connector *connector,
>-		    const struct intel_hdcp_shim *shim)
>+		    const struct intel_hdcp_shim *shim,
>+		    bool hdcp2_supported)
> {
> 	struct intel_hdcp *hdcp = &connector->hdcp;
> 	int ret;
>
>+	if (!shim)
>+		return -EINVAL;
>+
> 	ret = drm_connector_attach_content_protection_property(
> 			&connector->base);
> 	if (ret)
>@@ -758,6 +768,10 @@ int intel_hdcp_init(struct intel_connector *connector,
> 	mutex_init(&hdcp->mutex);
> 	INIT_DELAYED_WORK(&hdcp->check_work, intel_hdcp_check_work);
> 	INIT_WORK(&hdcp->prop_work, intel_hdcp_prop_work);
>+
>+	if (hdcp2_supported)
>+		intel_hdcp2_init(connector);
>+
> 	return 0;
> }
>
>@@ -895,3 +909,64 @@ int intel_hdcp_check_link(struct intel_connector
>*connector)
> 	mutex_unlock(&hdcp->mutex);
> 	return ret;
> }
>+
>+static int i915_hdcp_component_match(struct device *dev, void *data) {
>+	return !strcmp(dev->driver->name, "mei_hdcp"); }
>+
>+static int initialize_mei_hdcp_data(struct intel_connector *connector)
>+{
>+	struct intel_hdcp *hdcp = &connector->hdcp;
>+	struct mei_hdcp_data *data = &hdcp->mei_data;
>+	enum port port;
>+
>+	if (connector->encoder) {
>+		port = connector->encoder->port;
>+		data->port = GET_MEI_DDI_INDEX(port);
>+	}
>+
>+	data->port_type = INTEGRATED;
>+	data->protocol = hdcp->shim->hdcp_protocol();
>+
>+	data->k = 1;
>+	if (!data->streams)
>+		data->streams = kcalloc(data->k,
>+					sizeof(struct hdcp2_streamid_type),
>+					GFP_KERNEL);
>+	if (!data->streams) {
>+		DRM_ERROR("Out of Memory\n");
>+		return -ENOMEM;
>+	}
>+
>+	data->streams[0].stream_id = 0;
>+	data->streams[0].stream_type = hdcp->content_type;
>+
>+	return 0;
>+}
>+
>+bool is_hdcp2_supported(struct drm_i915_private *dev_priv) {
>+	return ((INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv) ||
>+		 IS_KABYLAKE(dev_priv)) &&
>IS_ENABLED(CONFIG_INTEL_MEI_HDCP));
>+}
>+
>+static int intel_hdcp2_init(struct intel_connector *connector) {

The caller doesn't care for the return. Either make it void or handle the error.
I recommend later would be good.

>+	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>+	struct intel_hdcp *hdcp = &connector->hdcp;
>+	int ret;
>+
>+	WARN_ON(!is_hdcp2_supported(dev_priv));

Don't think this extra check is required, since it's called only from 1 place with
hdcp2 check already taken care of. This can be dropped.

>+	ret = initialize_mei_hdcp_data(connector);
>+	if (ret)
>+		goto exit;
>+
>+	component_match_add(dev_priv->drm.dev, &dev_priv->master_match,
>+			    i915_hdcp_component_match, dev_priv);
>+
>+	hdcp->hdcp2_supported = true;
>+
>+exit:
>+	return ret;
>+}
>diff --git a/drivers/gpu/drm/i915/intel_hdmi.c
>b/drivers/gpu/drm/i915/intel_hdmi.c
>index 8363fbd18ee8..7988f958d835 100644
>--- a/drivers/gpu/drm/i915/intel_hdmi.c
>+++ b/drivers/gpu/drm/i915/intel_hdmi.c
>@@ -2366,7 +2366,7 @@ void intel_hdmi_init_connector(struct
>intel_digital_port *intel_dig_port,
>
> 	if (is_hdcp_supported(dev_priv, port)) {
> 		int ret = intel_hdcp_init(intel_connector,
>-					  &intel_hdmi_hdcp_shim);
>+					  &intel_hdmi_hdcp_shim, false);

A comment mentioning the reason for hdcp2 supported to be false would be good.

> 		if (ret)
> 			DRM_DEBUG_KMS("HDCP init failed, skipping.\n");
> 	}
>diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h
>index 52313bc227b2..f208a83ea2c9 100644
>--- a/include/drm/i915_component.h
>+++ b/include/drm/i915_component.h
>@@ -24,6 +24,10 @@
> #ifndef _I915_COMPONENT_H_
> #define _I915_COMPONENT_H_
>
>+#include <linux/mei_cl_bus.h>
>+#include <linux/mei_hdcp.h>
>+#include <drm/drm_hdcp.h>
>+
> /* MAX_PORT is the number of port
>  * It must be sync with I915_MAX_PORTS defined i915_drv.h
>  */
>@@ -121,6 +125,54 @@ struct i915_audio_component {
> 	const struct i915_audio_component_audio_ops *audio_ops;  };
>
>+struct i915_hdcp_component_ops {
>+	/**
>+	 * @owner: mei_hdcp module
>+	 */
>+	struct module *owner;
>+	int (*initiate_hdcp2_session)(struct mei_cl_device *cldev,
>+				      struct mei_hdcp_data *data,
>+				      struct hdcp2_ake_init *ake_data);
>+	int
>+	(*verify_receiver_cert_prepare_km)(struct mei_cl_device *cldev,
>+					   struct mei_hdcp_data *data,
>+					   struct hdcp2_ake_send_cert *rx_cert,
>+					   bool *km_stored,
>+					   struct hdcp2_ake_no_stored_km
>+								*ek_pub_km,
>+					   size_t *msg_sz);
>+	int (*verify_hprime)(struct mei_cl_device *cldev,
>+			     struct mei_hdcp_data *data,
>+			     struct hdcp2_ake_send_hprime *rx_hprime);
>+	int (*store_pairing_info)(struct mei_cl_device *cldev,
>+				  struct mei_hdcp_data *data,
>+				  struct hdcp2_ake_send_pairing_info
>+								*pairing_info);
>+	int (*initiate_locality_check)(struct mei_cl_device *cldev,
>+				       struct mei_hdcp_data *data,
>+				       struct hdcp2_lc_init *lc_init_data);
>+	int (*verify_lprime)(struct mei_cl_device *cldev,
>+			     struct mei_hdcp_data *data,
>+			     struct hdcp2_lc_send_lprime *rx_lprime);
>+	int (*get_session_key)(struct mei_cl_device *cldev,
>+			       struct mei_hdcp_data *data,
>+			       struct hdcp2_ske_send_eks *ske_data);
>+	int
>+	(*repeater_check_flow_prepare_ack)(struct mei_cl_device *cldev,
>+					   struct mei_hdcp_data *data,
>+					   struct hdcp2_rep_send_receiverid_list
>+								*rep_topology,
>+					   struct hdcp2_rep_send_ack
>+
>	*rep_send_ack);
>+	int (*verify_mprime)(struct mei_cl_device *cldev,
>+			     struct mei_hdcp_data *data,
>+			     struct hdcp2_rep_stream_ready *stream_ready);
>+	int (*enable_hdcp_authentication)(struct mei_cl_device *cldev,
>+					  struct mei_hdcp_data *data);
>+	int (*close_hdcp_session)(struct mei_cl_device *cldev,
>+				  struct mei_hdcp_data *data);
>+};
>+
> /**
>  * struct i915_component_master - Used for communication between i915
>  * and any other drivers for the services of different feature.
>@@ -131,6 +183,14 @@ struct i915_component_master {
> 	 * removing the reference to mei_cldev.
> 	 */
> 	struct device *i915_kdev;
>+	/**
>+	 * @mei_cldev: mei client device, used as parameter for ops
>+	 */
>+	struct mei_cl_device *mei_cldev;
>+	/**
>+	 * @ops: Ops implemented by mei_hdcp driver, used by i915 driver.
>+	 */
>+	const struct i915_hdcp_component_ops *hdcp_ops;
>
> 	/*
> 	 * Add here the interface details between I915 and interested modules.
>--
>2.7.4
Ramalingam C Aug. 1, 2018, 11:42 a.m. UTC | #3
On Wednesday 01 August 2018 01:11 AM, Shankar, Uma wrote:
>> -----Original Message-----
>> From: C, Ramalingam
>> Sent: Saturday, July 14, 2018 8:45 AM
>> To: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org;
>> daniel@ffwll.ch; seanpaul@chromium.org; Winkler, Tomas
>> <tomas.winkler@intel.com>; Usyskin, Alexander <alexander.usyskin@intel.com>;
>> Shankar, Uma <uma.shankar@intel.com>
>> Cc: Sharma, Shashank <shashank.sharma@intel.com>; C, Ramalingam
>> <ramalingam.c@intel.com>
>> Subject: [PATCH v6 09/35] drm/i915: Initialize HDCP2.2 and its MEI interface
>>
>> Initialize HDCP2.2 support. This includes the mei interface initialization along with
>> required component registration.
>>
>> v2:
>>   mei interface handle is protected with mutex. [Chris Wilson]
>> v3:
>>   Notifiers are used for the mei interface state.
>> v4:
>>   Poll for mei client device state
>>   Error msg for out of mem [Uma]
>>   Inline req for init function removed [Uma]
>> v5:
>>   Rebase as Part of reordering.
>>   Component is used for the I915 and MEI_HDCP interface [Daniel]
>> v6:
>>   HDCP2.2 uses the I915 component master to communicate with mei_hdcp
>> 	- [Daniel]
>>   Required HDCP2.2 variables defined [Sean Paul]
>>
>> Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
>> ---
>> drivers/gpu/drm/i915/intel_dp.c   |  3 +-
>> drivers/gpu/drm/i915/intel_drv.h  | 23 +++++++++++-
>> drivers/gpu/drm/i915/intel_hdcp.c | 77
>> ++++++++++++++++++++++++++++++++++++++-
>> drivers/gpu/drm/i915/intel_hdmi.c |  2 +-
>> include/drm/i915_component.h      | 60 ++++++++++++++++++++++++++++++
>> 5 files changed, 161 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>> index 5be07e1d816d..12eb5bd33b7e 100644
>> --- a/drivers/gpu/drm/i915/intel_dp.c
>> +++ b/drivers/gpu/drm/i915/intel_dp.c
>> @@ -6406,7 +6406,8 @@ intel_dp_init_connector(struct intel_digital_port
>> *intel_dig_port,
>> 	intel_dp_add_properties(intel_dp, connector);
>>
>> 	if (is_hdcp_supported(dev_priv, port) && !intel_dp_is_edp(intel_dp)) {
>> -		int ret = intel_hdcp_init(intel_connector, &intel_dp_hdcp_shim);
>> +		int ret = intel_hdcp_init(intel_connector, &intel_dp_hdcp_shim,
>> +					  false);
>> 		if (ret)
>> 			DRM_DEBUG_KMS("HDCP init failed, skipping.\n");
>> 	}
>> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
>> index c32665136d5d..38262792813a 100644
>> --- a/drivers/gpu/drm/i915/intel_drv.h
>> +++ b/drivers/gpu/drm/i915/intel_drv.h
>> @@ -29,6 +29,7 @@
>> #include <linux/i2c.h>
>> #include <linux/hdmi.h>
>> #include <linux/sched/clock.h>
>> +#include <linux/mei_hdcp.h>
>> #include <drm/i915_drm.h>
>> #include "i915_drv.h"
>> #include <drm/drm_crtc.h>
>> @@ -376,6 +377,9 @@ struct intel_hdcp_shim {
>> 	/* Detects panel's hdcp capability. This is optional for HDMI. */
>> 	int (*hdcp_capable)(struct intel_digital_port *intel_dig_port,
>> 			    bool *hdcp_capable);
>> +
>> +	/* Detects the HDCP protocol(DP/HDMI) required on the port */
>> +	enum hdcp_protocol (*hdcp_protocol)(void);
>> };
>>
>> struct intel_hdcp {
>> @@ -385,6 +389,20 @@ struct intel_hdcp {
>> 	uint64_t value;
>> 	struct delayed_work check_work;
>> 	struct work_struct prop_work;
>> +
>> +	/* HDCP2.2 related definitions */
>> +	/* Flag indicates whether this connector supports HDCP2.2 or not. */
>> +	bool hdcp2_supported;
>> +
>> +	/*
>> +	 * Content Stream Type defined by content owner. TYPE0(0x0) content
>> can
>> +	 * flow in the link protected by HDCP2.2 or HDCP1.4, where as
>> TYPE1(0x1)
>> +	 * content can flow only through a link protected by HDCP2.2.
>> +	 */
>> +	u8 content_type;
>> +
>> +	/* mei interface related information */
>> +	struct mei_hdcp_data mei_data;
>> };
>>
>> struct intel_connector {
>> @@ -1903,11 +1921,14 @@ void intel_hdcp_atomic_check(struct
>> drm_connector *connector,
>> 			     struct drm_connector_state *old_state,
>> 			     struct drm_connector_state *new_state);  int
>> intel_hdcp_init(struct intel_connector *connector,
>> -		    const struct intel_hdcp_shim *hdcp_shim);
>> +		    const struct intel_hdcp_shim *hdcp_shim,
>> +		    bool hdcp2_supported);
>> int intel_hdcp_enable(struct intel_connector *connector);  int
>> intel_hdcp_disable(struct intel_connector *connector);  int
>> intel_hdcp_check_link(struct intel_connector *connector);  bool
>> is_hdcp_supported(struct drm_i915_private *dev_priv, enum port port);
>> +int intel_hdcp_component_init(struct drm_i915_private *dev_priv); bool
>> +is_hdcp2_supported(struct drm_i915_private *dev_priv);
>>
>> /* intel_psr.c */
>> #define CAN_PSR(dev_priv) (HAS_PSR(dev_priv) && dev_priv->psr.sink_support)
>> diff --git a/drivers/gpu/drm/i915/intel_hdcp.c
>> b/drivers/gpu/drm/i915/intel_hdcp.c
>> index 55bc4d423187..cfe915c3f336 100644
>> --- a/drivers/gpu/drm/i915/intel_hdcp.c
>> +++ b/drivers/gpu/drm/i915/intel_hdcp.c
>> @@ -8,13 +8,19 @@
>>
>> #include <drm/drmP.h>
>> #include <drm/drm_hdcp.h>
>> +#include <drm/i915_component.h>
>> #include <linux/i2c.h>
>> #include <linux/random.h>
>> +#include <linux/component.h>
>>
>> #include "intel_drv.h"
>> #include "i915_reg.h"
>>
>> #define KEY_LOAD_TRIES	5
>> +#define GET_MEI_DDI_INDEX(port)		(((port) == PORT_A) ? DDI_A : \
>> +					 (enum hdcp_physical_port)(port))
>> +
>> +static int intel_hdcp2_init(struct intel_connector *connector);
>>
>> static int intel_hdcp_poll_ksv_fifo(struct intel_digital_port *intel_dig_port,
>> 				    const struct intel_hdcp_shim *shim) @@ -
>> 744,11 +750,15 @@ bool is_hdcp_supported(struct drm_i915_private *dev_priv,
>> enum port port)  }
>>
>> int intel_hdcp_init(struct intel_connector *connector,
>> -		    const struct intel_hdcp_shim *shim)
>> +		    const struct intel_hdcp_shim *shim,
>> +		    bool hdcp2_supported)
>> {
>> 	struct intel_hdcp *hdcp = &connector->hdcp;
>> 	int ret;
>>
>> +	if (!shim)
>> +		return -EINVAL;
>> +
>> 	ret = drm_connector_attach_content_protection_property(
>> 			&connector->base);
>> 	if (ret)
>> @@ -758,6 +768,10 @@ int intel_hdcp_init(struct intel_connector *connector,
>> 	mutex_init(&hdcp->mutex);
>> 	INIT_DELAYED_WORK(&hdcp->check_work, intel_hdcp_check_work);
>> 	INIT_WORK(&hdcp->prop_work, intel_hdcp_prop_work);
>> +
>> +	if (hdcp2_supported)
>> +		intel_hdcp2_init(connector);
>> +
>> 	return 0;
>> }
>>
>> @@ -895,3 +909,64 @@ int intel_hdcp_check_link(struct intel_connector
>> *connector)
>> 	mutex_unlock(&hdcp->mutex);
>> 	return ret;
>> }
>> +
>> +static int i915_hdcp_component_match(struct device *dev, void *data) {
>> +	return !strcmp(dev->driver->name, "mei_hdcp"); }
>> +
>> +static int initialize_mei_hdcp_data(struct intel_connector *connector)
>> +{
>> +	struct intel_hdcp *hdcp = &connector->hdcp;
>> +	struct mei_hdcp_data *data = &hdcp->mei_data;
>> +	enum port port;
>> +
>> +	if (connector->encoder) {
>> +		port = connector->encoder->port;
>> +		data->port = GET_MEI_DDI_INDEX(port);
>> +	}
>> +
>> +	data->port_type = INTEGRATED;
>> +	data->protocol = hdcp->shim->hdcp_protocol();
>> +
>> +	data->k = 1;
>> +	if (!data->streams)
>> +		data->streams = kcalloc(data->k,
>> +					sizeof(struct hdcp2_streamid_type),
>> +					GFP_KERNEL);
>> +	if (!data->streams) {
>> +		DRM_ERROR("Out of Memory\n");
>> +		return -ENOMEM;
>> +	}
>> +
>> +	data->streams[0].stream_id = 0;
>> +	data->streams[0].stream_type = hdcp->content_type;
>> +
>> +	return 0;
>> +}
>> +
>> +bool is_hdcp2_supported(struct drm_i915_private *dev_priv) {
>> +	return ((INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv) ||
>> +		 IS_KABYLAKE(dev_priv)) &&
>> IS_ENABLED(CONFIG_INTEL_MEI_HDCP));
>> +}
>> +
>> +static int intel_hdcp2_init(struct intel_connector *connector) {
> The caller doesn't care for the return. Either make it void or handle the error.
> I recommend later would be good.
Make sense return void, as no need to handle the error state at caller.
>> +	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> +	struct intel_hdcp *hdcp = &connector->hdcp;
>> +	int ret;
>> +
>> +	WARN_ON(!is_hdcp2_supported(dev_priv));
> Don't think this extra check is required, since it's called only from 1 place with
> hdcp2 check already taken care of. This can be dropped.
I believe this extra check should be ok. Being more paranoid just to 
catch if we are here by mistake.
>
>> +	ret = initialize_mei_hdcp_data(connector);
>> +	if (ret)
>> +		goto exit;
>> +
>> +	component_match_add(dev_priv->drm.dev, &dev_priv->master_match,
>> +			    i915_hdcp_component_match, dev_priv);
>> +
>> +	hdcp->hdcp2_supported = true;
>> +
>> +exit:
>> +	return ret;
>> +}
>> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c
>> b/drivers/gpu/drm/i915/intel_hdmi.c
>> index 8363fbd18ee8..7988f958d835 100644
>> --- a/drivers/gpu/drm/i915/intel_hdmi.c
>> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
>> @@ -2366,7 +2366,7 @@ void intel_hdmi_init_connector(struct
>> intel_digital_port *intel_dig_port,
>>
>> 	if (is_hdcp_supported(dev_priv, port)) {
>> 		int ret = intel_hdcp_init(intel_connector,
>> -					  &intel_hdmi_hdcp_shim);
>> +					  &intel_hdmi_hdcp_shim, false);
> A comment mentioning the reason for hdcp2 supported to be false would be good.
This is just intermediate state. later patch will replace this with 
connector's hdcp2.2 capability.
So I guess I will skip this comment.

--Ram
>
>> 		if (ret)
>> 			DRM_DEBUG_KMS("HDCP init failed, skipping.\n");
>> 	}
>> diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h
>> index 52313bc227b2..f208a83ea2c9 100644
>> --- a/include/drm/i915_component.h
>> +++ b/include/drm/i915_component.h
>> @@ -24,6 +24,10 @@
>> #ifndef _I915_COMPONENT_H_
>> #define _I915_COMPONENT_H_
>>
>> +#include <linux/mei_cl_bus.h>
>> +#include <linux/mei_hdcp.h>
>> +#include <drm/drm_hdcp.h>
>> +
>> /* MAX_PORT is the number of port
>>   * It must be sync with I915_MAX_PORTS defined i915_drv.h
>>   */
>> @@ -121,6 +125,54 @@ struct i915_audio_component {
>> 	const struct i915_audio_component_audio_ops *audio_ops;  };
>>
>> +struct i915_hdcp_component_ops {
>> +	/**
>> +	 * @owner: mei_hdcp module
>> +	 */
>> +	struct module *owner;
>> +	int (*initiate_hdcp2_session)(struct mei_cl_device *cldev,
>> +				      struct mei_hdcp_data *data,
>> +				      struct hdcp2_ake_init *ake_data);
>> +	int
>> +	(*verify_receiver_cert_prepare_km)(struct mei_cl_device *cldev,
>> +					   struct mei_hdcp_data *data,
>> +					   struct hdcp2_ake_send_cert *rx_cert,
>> +					   bool *km_stored,
>> +					   struct hdcp2_ake_no_stored_km
>> +								*ek_pub_km,
>> +					   size_t *msg_sz);
>> +	int (*verify_hprime)(struct mei_cl_device *cldev,
>> +			     struct mei_hdcp_data *data,
>> +			     struct hdcp2_ake_send_hprime *rx_hprime);
>> +	int (*store_pairing_info)(struct mei_cl_device *cldev,
>> +				  struct mei_hdcp_data *data,
>> +				  struct hdcp2_ake_send_pairing_info
>> +								*pairing_info);
>> +	int (*initiate_locality_check)(struct mei_cl_device *cldev,
>> +				       struct mei_hdcp_data *data,
>> +				       struct hdcp2_lc_init *lc_init_data);
>> +	int (*verify_lprime)(struct mei_cl_device *cldev,
>> +			     struct mei_hdcp_data *data,
>> +			     struct hdcp2_lc_send_lprime *rx_lprime);
>> +	int (*get_session_key)(struct mei_cl_device *cldev,
>> +			       struct mei_hdcp_data *data,
>> +			       struct hdcp2_ske_send_eks *ske_data);
>> +	int
>> +	(*repeater_check_flow_prepare_ack)(struct mei_cl_device *cldev,
>> +					   struct mei_hdcp_data *data,
>> +					   struct hdcp2_rep_send_receiverid_list
>> +								*rep_topology,
>> +					   struct hdcp2_rep_send_ack
>> +
>> 	*rep_send_ack);
>> +	int (*verify_mprime)(struct mei_cl_device *cldev,
>> +			     struct mei_hdcp_data *data,
>> +			     struct hdcp2_rep_stream_ready *stream_ready);
>> +	int (*enable_hdcp_authentication)(struct mei_cl_device *cldev,
>> +					  struct mei_hdcp_data *data);
>> +	int (*close_hdcp_session)(struct mei_cl_device *cldev,
>> +				  struct mei_hdcp_data *data);
>> +};
>> +
>> /**
>>   * struct i915_component_master - Used for communication between i915
>>   * and any other drivers for the services of different feature.
>> @@ -131,6 +183,14 @@ struct i915_component_master {
>> 	 * removing the reference to mei_cldev.
>> 	 */
>> 	struct device *i915_kdev;
>> +	/**
>> +	 * @mei_cldev: mei client device, used as parameter for ops
>> +	 */
>> +	struct mei_cl_device *mei_cldev;
>> +	/**
>> +	 * @ops: Ops implemented by mei_hdcp driver, used by i915 driver.
>> +	 */
>> +	const struct i915_hdcp_component_ops *hdcp_ops;
>>
>> 	/*
>> 	 * Add here the interface details between I915 and interested modules.
>> --
>> 2.7.4
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 5be07e1d816d..12eb5bd33b7e 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -6406,7 +6406,8 @@  intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
 	intel_dp_add_properties(intel_dp, connector);
 
 	if (is_hdcp_supported(dev_priv, port) && !intel_dp_is_edp(intel_dp)) {
-		int ret = intel_hdcp_init(intel_connector, &intel_dp_hdcp_shim);
+		int ret = intel_hdcp_init(intel_connector, &intel_dp_hdcp_shim,
+					  false);
 		if (ret)
 			DRM_DEBUG_KMS("HDCP init failed, skipping.\n");
 	}
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index c32665136d5d..38262792813a 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -29,6 +29,7 @@ 
 #include <linux/i2c.h>
 #include <linux/hdmi.h>
 #include <linux/sched/clock.h>
+#include <linux/mei_hdcp.h>
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
 #include <drm/drm_crtc.h>
@@ -376,6 +377,9 @@  struct intel_hdcp_shim {
 	/* Detects panel's hdcp capability. This is optional for HDMI. */
 	int (*hdcp_capable)(struct intel_digital_port *intel_dig_port,
 			    bool *hdcp_capable);
+
+	/* Detects the HDCP protocol(DP/HDMI) required on the port */
+	enum hdcp_protocol (*hdcp_protocol)(void);
 };
 
 struct intel_hdcp {
@@ -385,6 +389,20 @@  struct intel_hdcp {
 	uint64_t value;
 	struct delayed_work check_work;
 	struct work_struct prop_work;
+
+	/* HDCP2.2 related definitions */
+	/* Flag indicates whether this connector supports HDCP2.2 or not. */
+	bool hdcp2_supported;
+
+	/*
+	 * Content Stream Type defined by content owner. TYPE0(0x0) content can
+	 * flow in the link protected by HDCP2.2 or HDCP1.4, where as TYPE1(0x1)
+	 * content can flow only through a link protected by HDCP2.2.
+	 */
+	u8 content_type;
+
+	/* mei interface related information */
+	struct mei_hdcp_data mei_data;
 };
 
 struct intel_connector {
@@ -1903,11 +1921,14 @@  void intel_hdcp_atomic_check(struct drm_connector *connector,
 			     struct drm_connector_state *old_state,
 			     struct drm_connector_state *new_state);
 int intel_hdcp_init(struct intel_connector *connector,
-		    const struct intel_hdcp_shim *hdcp_shim);
+		    const struct intel_hdcp_shim *hdcp_shim,
+		    bool hdcp2_supported);
 int intel_hdcp_enable(struct intel_connector *connector);
 int intel_hdcp_disable(struct intel_connector *connector);
 int intel_hdcp_check_link(struct intel_connector *connector);
 bool is_hdcp_supported(struct drm_i915_private *dev_priv, enum port port);
+int intel_hdcp_component_init(struct drm_i915_private *dev_priv);
+bool is_hdcp2_supported(struct drm_i915_private *dev_priv);
 
 /* intel_psr.c */
 #define CAN_PSR(dev_priv) (HAS_PSR(dev_priv) && dev_priv->psr.sink_support)
diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c
index 55bc4d423187..cfe915c3f336 100644
--- a/drivers/gpu/drm/i915/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/intel_hdcp.c
@@ -8,13 +8,19 @@ 
 
 #include <drm/drmP.h>
 #include <drm/drm_hdcp.h>
+#include <drm/i915_component.h>
 #include <linux/i2c.h>
 #include <linux/random.h>
+#include <linux/component.h>
 
 #include "intel_drv.h"
 #include "i915_reg.h"
 
 #define KEY_LOAD_TRIES	5
+#define GET_MEI_DDI_INDEX(port)		(((port) == PORT_A) ? DDI_A : \
+					 (enum hdcp_physical_port)(port))
+
+static int intel_hdcp2_init(struct intel_connector *connector);
 
 static int intel_hdcp_poll_ksv_fifo(struct intel_digital_port *intel_dig_port,
 				    const struct intel_hdcp_shim *shim)
@@ -744,11 +750,15 @@  bool is_hdcp_supported(struct drm_i915_private *dev_priv, enum port port)
 }
 
 int intel_hdcp_init(struct intel_connector *connector,
-		    const struct intel_hdcp_shim *shim)
+		    const struct intel_hdcp_shim *shim,
+		    bool hdcp2_supported)
 {
 	struct intel_hdcp *hdcp = &connector->hdcp;
 	int ret;
 
+	if (!shim)
+		return -EINVAL;
+
 	ret = drm_connector_attach_content_protection_property(
 			&connector->base);
 	if (ret)
@@ -758,6 +768,10 @@  int intel_hdcp_init(struct intel_connector *connector,
 	mutex_init(&hdcp->mutex);
 	INIT_DELAYED_WORK(&hdcp->check_work, intel_hdcp_check_work);
 	INIT_WORK(&hdcp->prop_work, intel_hdcp_prop_work);
+
+	if (hdcp2_supported)
+		intel_hdcp2_init(connector);
+
 	return 0;
 }
 
@@ -895,3 +909,64 @@  int intel_hdcp_check_link(struct intel_connector *connector)
 	mutex_unlock(&hdcp->mutex);
 	return ret;
 }
+
+static int i915_hdcp_component_match(struct device *dev, void *data)
+{
+	return !strcmp(dev->driver->name, "mei_hdcp");
+}
+
+static int initialize_mei_hdcp_data(struct intel_connector *connector)
+{
+	struct intel_hdcp *hdcp = &connector->hdcp;
+	struct mei_hdcp_data *data = &hdcp->mei_data;
+	enum port port;
+
+	if (connector->encoder) {
+		port = connector->encoder->port;
+		data->port = GET_MEI_DDI_INDEX(port);
+	}
+
+	data->port_type = INTEGRATED;
+	data->protocol = hdcp->shim->hdcp_protocol();
+
+	data->k = 1;
+	if (!data->streams)
+		data->streams = kcalloc(data->k,
+					sizeof(struct hdcp2_streamid_type),
+					GFP_KERNEL);
+	if (!data->streams) {
+		DRM_ERROR("Out of Memory\n");
+		return -ENOMEM;
+	}
+
+	data->streams[0].stream_id = 0;
+	data->streams[0].stream_type = hdcp->content_type;
+
+	return 0;
+}
+
+bool is_hdcp2_supported(struct drm_i915_private *dev_priv)
+{
+	return ((INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv) ||
+		 IS_KABYLAKE(dev_priv)) && IS_ENABLED(CONFIG_INTEL_MEI_HDCP));
+}
+
+static int intel_hdcp2_init(struct intel_connector *connector)
+{
+	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
+	struct intel_hdcp *hdcp = &connector->hdcp;
+	int ret;
+
+	WARN_ON(!is_hdcp2_supported(dev_priv));
+	ret = initialize_mei_hdcp_data(connector);
+	if (ret)
+		goto exit;
+
+	component_match_add(dev_priv->drm.dev, &dev_priv->master_match,
+			    i915_hdcp_component_match, dev_priv);
+
+	hdcp->hdcp2_supported = true;
+
+exit:
+	return ret;
+}
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 8363fbd18ee8..7988f958d835 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -2366,7 +2366,7 @@  void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
 
 	if (is_hdcp_supported(dev_priv, port)) {
 		int ret = intel_hdcp_init(intel_connector,
-					  &intel_hdmi_hdcp_shim);
+					  &intel_hdmi_hdcp_shim, false);
 		if (ret)
 			DRM_DEBUG_KMS("HDCP init failed, skipping.\n");
 	}
diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h
index 52313bc227b2..f208a83ea2c9 100644
--- a/include/drm/i915_component.h
+++ b/include/drm/i915_component.h
@@ -24,6 +24,10 @@ 
 #ifndef _I915_COMPONENT_H_
 #define _I915_COMPONENT_H_
 
+#include <linux/mei_cl_bus.h>
+#include <linux/mei_hdcp.h>
+#include <drm/drm_hdcp.h>
+
 /* MAX_PORT is the number of port
  * It must be sync with I915_MAX_PORTS defined i915_drv.h
  */
@@ -121,6 +125,54 @@  struct i915_audio_component {
 	const struct i915_audio_component_audio_ops *audio_ops;
 };
 
+struct i915_hdcp_component_ops {
+	/**
+	 * @owner: mei_hdcp module
+	 */
+	struct module *owner;
+	int (*initiate_hdcp2_session)(struct mei_cl_device *cldev,
+				      struct mei_hdcp_data *data,
+				      struct hdcp2_ake_init *ake_data);
+	int
+	(*verify_receiver_cert_prepare_km)(struct mei_cl_device *cldev,
+					   struct mei_hdcp_data *data,
+					   struct hdcp2_ake_send_cert *rx_cert,
+					   bool *km_stored,
+					   struct hdcp2_ake_no_stored_km
+								*ek_pub_km,
+					   size_t *msg_sz);
+	int (*verify_hprime)(struct mei_cl_device *cldev,
+			     struct mei_hdcp_data *data,
+			     struct hdcp2_ake_send_hprime *rx_hprime);
+	int (*store_pairing_info)(struct mei_cl_device *cldev,
+				  struct mei_hdcp_data *data,
+				  struct hdcp2_ake_send_pairing_info
+								*pairing_info);
+	int (*initiate_locality_check)(struct mei_cl_device *cldev,
+				       struct mei_hdcp_data *data,
+				       struct hdcp2_lc_init *lc_init_data);
+	int (*verify_lprime)(struct mei_cl_device *cldev,
+			     struct mei_hdcp_data *data,
+			     struct hdcp2_lc_send_lprime *rx_lprime);
+	int (*get_session_key)(struct mei_cl_device *cldev,
+			       struct mei_hdcp_data *data,
+			       struct hdcp2_ske_send_eks *ske_data);
+	int
+	(*repeater_check_flow_prepare_ack)(struct mei_cl_device *cldev,
+					   struct mei_hdcp_data *data,
+					   struct hdcp2_rep_send_receiverid_list
+								*rep_topology,
+					   struct hdcp2_rep_send_ack
+								*rep_send_ack);
+	int (*verify_mprime)(struct mei_cl_device *cldev,
+			     struct mei_hdcp_data *data,
+			     struct hdcp2_rep_stream_ready *stream_ready);
+	int (*enable_hdcp_authentication)(struct mei_cl_device *cldev,
+					  struct mei_hdcp_data *data);
+	int (*close_hdcp_session)(struct mei_cl_device *cldev,
+				  struct mei_hdcp_data *data);
+};
+
 /**
  * struct i915_component_master - Used for communication between i915
  * and any other drivers for the services of different feature.
@@ -131,6 +183,14 @@  struct i915_component_master {
 	 * removing the reference to mei_cldev.
 	 */
 	struct device *i915_kdev;
+	/**
+	 * @mei_cldev: mei client device, used as parameter for ops
+	 */
+	struct mei_cl_device *mei_cldev;
+	/**
+	 * @ops: Ops implemented by mei_hdcp driver, used by i915 driver.
+	 */
+	const struct i915_hdcp_component_ops *hdcp_ops;
 
 	/*
 	 * Add here the interface details between I915 and interested modules.