]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/display: Move HDCP helpers into display-helper module
authorThomas Zimmermann <tzimmermann@suse.de>
Thu, 21 Apr 2022 07:31:06 +0000 (09:31 +0200)
committerThomas Zimmermann <tzimmermann@suse.de>
Mon, 25 Apr 2022 09:19:36 +0000 (11:19 +0200)
Move DRM's HDCP helper library into the display/ subdirectory and add
it to DRM's display helpers. Split the header file into core and helpers.
Update all affected drivers. No functional changes.

v3:
* fix Kconfig dependencies
v2:
* fix include statements (Jani, Javier)
* update Kconfig symbols

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220421073108.19226-7-tzimmermann@suse.de
27 files changed:
Documentation/gpu/drm-kms-helpers.rst
drivers/gpu/drm/Makefile
drivers/gpu/drm/amd/display/Kconfig
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h
drivers/gpu/drm/bridge/Kconfig
drivers/gpu/drm/bridge/analogix/Kconfig
drivers/gpu/drm/bridge/analogix/anx7625.c
drivers/gpu/drm/bridge/cadence/Kconfig
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c
drivers/gpu/drm/bridge/ite-it6505.c
drivers/gpu/drm/display/Kconfig
drivers/gpu/drm/display/Makefile
drivers/gpu/drm/display/drm_hdcp_helper.c [new file with mode: 0644]
drivers/gpu/drm/drm_hdcp.c [deleted file]
drivers/gpu/drm/i915/Kconfig
drivers/gpu/drm/i915/display/intel_dp_hdcp.c
drivers/gpu/drm/i915/display/intel_gmbus.c
drivers/gpu/drm/i915/display/intel_hdcp.c
drivers/gpu/drm/i915/display/intel_hdmi.c
drivers/misc/mei/hdcp/mei_hdcp.h
include/drm/display/drm_hdcp.h [new file with mode: 0644]
include/drm/display/drm_hdcp_helper.h [new file with mode: 0644]
include/drm/drm_hdcp.h [deleted file]
include/drm/i915_mei_hdcp_interface.h

index 7af55fb4072c732e451d80d29e769bfe804e6ba9..cfda5a092a48e87fcd65b4fa139045003d6ae3db 100644 (file)
@@ -226,7 +226,7 @@ Panel Self Refresh Helper Reference
 HDCP Helper Functions Reference
 ===============================
 
-.. kernel-doc:: drivers/gpu/drm/drm_hdcp.c
+.. kernel-doc:: drivers/gpu/drm/display/drm_hdcp_helper.c
    :export:
 
 Display Port Helper Functions Reference
index b8353af701522dc0684bb4236f1328a8589e4622..746a3a4953f36ec0a1eda47f26be27de3bb6c2c4 100644 (file)
@@ -58,7 +58,7 @@ obj-$(CONFIG_DRM_TTM_HELPER) += drm_ttm_helper.o
 #
 
 drm_kms_helper-y := drm_bridge_connector.o drm_crtc_helper.o \
-               drm_encoder_slave.o drm_flip_work.o drm_hdcp.o \
+               drm_encoder_slave.o drm_flip_work.o \
                drm_probe_helper.o \
                drm_plane_helper.o drm_atomic_helper.o \
                drm_kms_helper_common.o \
index 127667e549c199730cef24109417f39b960a44a8..b4029c0d5d8c5e9abbf98d285d3a5a17d3e7eabb 100644 (file)
@@ -20,6 +20,7 @@ config DRM_AMD_DC_DCN
 config DRM_AMD_DC_HDCP
        bool "Enable HDCP support in DC"
        depends on DRM_AMD_DC
+       select DRM_DISPLAY_HDCP_HELPER
        help
          Choose this option if you want to support HDCP authentication.
 
index 7ef20da6c18ffae8c3a5d0852b9a417a80adab5d..e3130b4af540fc95c8357968aa6a7d698d70ec81 100644 (file)
@@ -48,7 +48,7 @@
 #include "amdgpu_dm.h"
 #ifdef CONFIG_DRM_AMD_DC_HDCP
 #include "amdgpu_dm_hdcp.h"
-#include <drm/drm_hdcp.h>
+#include <drm/display/drm_hdcp_helper.h>
 #endif
 #include "amdgpu_pm.h"
 #include "amdgpu_atombios.h"
index bf0d50277f8f32c7cad9f4fbd1693d6556eb4425..15c0e3f2a9c36d04a8c6b6ff277dda81bb8c0518 100644 (file)
@@ -27,7 +27,7 @@
 #include "amdgpu.h"
 #include "amdgpu_dm.h"
 #include "dm_helpers.h"
-#include <drm/drm_hdcp.h>
+#include <drm/display/drm_hdcp_helper.h>
 #include "hdcp_psp.h"
 
 /*
index 6e88705e22f7b0d0562fee3fab2096efc70ce67b..392c0c03365accf9510fa39fd98c52a454b3ebf8 100644 (file)
@@ -30,7 +30,7 @@
 #include "hdcp_log.h"
 
 #include <drm/display/drm_dp_helper.h>
-#include <drm/drm_hdcp.h>
+#include <drm/display/drm_hdcp_helper.h>
 
 enum mod_hdcp_trans_input_result {
        UNKNOWN = 0,
index 73ea668babbfcd8db4a175b0a2dd42272c55fc11..ef9f1b0d91bf3c421066c2b23b7b07293e253844 100644 (file)
@@ -79,6 +79,7 @@ config DRM_ITE_IT6505
         tristate "ITE IT6505 DisplayPort bridge"
         depends on OF
        select DRM_DISPLAY_DP_HELPER
+       select DRM_DISPLAY_HDCP_HELPER
        select DRM_DISPLAY_HELPER
         select DRM_DP_AUX_BUS
         select DRM_KMS_HELPER
index 5570322dc528dcdba166a37ec9a05c04fd1278ef..173dada218ecd34841fe9b9d8f188804409ebd16 100644 (file)
@@ -35,6 +35,7 @@ config DRM_ANALOGIX_ANX7625
        depends on DRM
        depends on OF
        select DRM_DISPLAY_DP_HELPER
+       select DRM_DISPLAY_HDCP_HELPER
        select DRM_DISPLAY_HELPER
        select DRM_DP_AUX_BUS
        select DRM_MIPI_DSI
index be2c096374aacd49ab6cff950d3ae1e58590c562..53a5da6c49dd369186ac3d5d764d8dee842e968c 100644 (file)
 
 #include <drm/display/drm_dp_aux_bus.h>
 #include <drm/display/drm_dp_helper.h>
+#include <drm/display/drm_hdcp_helper.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_bridge.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_edid.h>
-#include <drm/drm_hdcp.h>
 #include <drm/drm_mipi_dsi.h>
 #include <drm/drm_of.h>
 #include <drm/drm_panel.h>
index 0f9e46c6de9bac1a5c9e5cbd71774f71ae5b7d99..1d06182bea71091b3660acdd03f6f83c7aba6085 100644 (file)
@@ -2,6 +2,7 @@
 config DRM_CDNS_MHDP8546
        tristate "Cadence DPI/DP bridge"
        select DRM_DISPLAY_DP_HELPER
+       select DRM_DISPLAY_HDCP_HELPER
        select DRM_DISPLAY_HELPER
        select DRM_KMS_HELPER
        select DRM_PANEL_BRIDGE
index dec93a6d14c734ceb9d8ff24944da06c0eeca75f..67f0f444b4e8c55ca360c0958b1aeab11b9079a1 100644 (file)
 #include <linux/wait.h>
 
 #include <drm/display/drm_dp_helper.h>
+#include <drm/display/drm_hdcp_helper.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_atomic_state_helper.h>
 #include <drm/drm_bridge.h>
 #include <drm/drm_connector.h>
 #include <drm/drm_crtc_helper.h>
-#include <drm/drm_hdcp.h>
 #include <drm/drm_modeset_helper_vtables.h>
 #include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
index fccd6fbcc257fcd917726255418a117bb4521769..946212a95598142f2375988797b724f9691f60e4 100644 (file)
@@ -11,7 +11,7 @@
 
 #include <asm/unaligned.h>
 
-#include <drm/drm_hdcp.h>
+#include <drm/display/drm_hdcp_helper.h>
 
 #include "cdns-mhdp8546-hdcp.h"
 
index 85cffc108278963598b58ea1ac8961fdb849bbef..8fed30df08b0c46979b37a9293e2a805547afb02 100644 (file)
 #include <crypto/hash.h>
 
 #include <drm/display/drm_dp_helper.h>
+#include <drm/display/drm_hdcp_helper.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_bridge.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_edid.h>
-#include <drm/drm_hdcp.h>
 #include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
 
index fcd9ffd39f266832527253ec60819026ef3f3ddb..4406af5cc8bbd930bb90753854ac5b464d059baa 100644 (file)
@@ -17,6 +17,12 @@ config DRM_DISPLAY_DP_HELPER
        help
          DRM display helpers for DisplayPort.
 
+config DRM_DISPLAY_HDCP_HELPER
+       bool
+       depends on DRM_DISPLAY_HELPER
+       help
+         DRM display helpers for HDCP.
+
 config DRM_DP_AUX_CHARDEV
        bool "DRM DP AUX Interface"
        depends on DRM
index 4f4e35034960a9ad25f2a86baed9eb25b5f480fb..abeb5ad8c35158918d5e7d5eeff73de09716f8af 100644 (file)
@@ -7,6 +7,7 @@ drm_display_helper-$(CONFIG_DRM_DISPLAY_DP_HELPER) += drm_dp_dual_mode_helper.o
                                                      drm_dp_helper.o \
                                                      drm_dp_mst_topology.o \
                                                      drm_dsc_helper.o
+drm_display_helper-$(CONFIG_DRM_DISPLAY_HDCP_HELPER) += drm_hdcp_helper.o
 drm_display_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o
 drm_display_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o
 
diff --git a/drivers/gpu/drm/display/drm_hdcp_helper.c b/drivers/gpu/drm/display/drm_hdcp_helper.c
new file mode 100644 (file)
index 0000000..e78999c
--- /dev/null
@@ -0,0 +1,421 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2019 Intel Corporation.
+ *
+ * Authors:
+ * Ramalingam C <ramalingam.c@intel.com>
+ */
+
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/gfp.h>
+#include <linux/export.h>
+#include <linux/slab.h>
+#include <linux/firmware.h>
+
+#include <drm/display/drm_hdcp_helper.h>
+#include <drm/drm_sysfs.h>
+#include <drm/drm_print.h>
+#include <drm/drm_device.h>
+#include <drm/drm_property.h>
+#include <drm/drm_mode_object.h>
+#include <drm/drm_connector.h>
+
+static inline void drm_hdcp_print_ksv(const u8 *ksv)
+{
+       DRM_DEBUG("\t%#02x, %#02x, %#02x, %#02x, %#02x\n",
+                 ksv[0], ksv[1], ksv[2], ksv[3], ksv[4]);
+}
+
+static u32 drm_hdcp_get_revoked_ksv_count(const u8 *buf, u32 vrls_length)
+{
+       u32 parsed_bytes = 0, ksv_count = 0, vrl_ksv_cnt, vrl_sz;
+
+       while (parsed_bytes < vrls_length) {
+               vrl_ksv_cnt = *buf;
+               ksv_count += vrl_ksv_cnt;
+
+               vrl_sz = (vrl_ksv_cnt * DRM_HDCP_KSV_LEN) + 1;
+               buf += vrl_sz;
+               parsed_bytes += vrl_sz;
+       }
+
+       /*
+        * When vrls are not valid, ksvs are not considered.
+        * Hence SRM will be discarded.
+        */
+       if (parsed_bytes != vrls_length)
+               ksv_count = 0;
+
+       return ksv_count;
+}
+
+static u32 drm_hdcp_get_revoked_ksvs(const u8 *buf, u8 **revoked_ksv_list,
+                                    u32 vrls_length)
+{
+       u32 vrl_ksv_cnt, vrl_ksv_sz, vrl_idx = 0;
+       u32 parsed_bytes = 0, ksv_count = 0;
+
+       do {
+               vrl_ksv_cnt = *buf;
+               vrl_ksv_sz = vrl_ksv_cnt * DRM_HDCP_KSV_LEN;
+
+               buf++;
+
+               DRM_DEBUG("vrl: %d, Revoked KSVs: %d\n", vrl_idx++,
+                         vrl_ksv_cnt);
+               memcpy((*revoked_ksv_list) + (ksv_count * DRM_HDCP_KSV_LEN),
+                      buf, vrl_ksv_sz);
+
+               ksv_count += vrl_ksv_cnt;
+               buf += vrl_ksv_sz;
+
+               parsed_bytes += (vrl_ksv_sz + 1);
+       } while (parsed_bytes < vrls_length);
+
+       return ksv_count;
+}
+
+static inline u32 get_vrl_length(const u8 *buf)
+{
+       return drm_hdcp_be24_to_cpu(buf);
+}
+
+static int drm_hdcp_parse_hdcp1_srm(const u8 *buf, size_t count,
+                                   u8 **revoked_ksv_list, u32 *revoked_ksv_cnt)
+{
+       struct hdcp_srm_header *header;
+       u32 vrl_length, ksv_count;
+
+       if (count < (sizeof(struct hdcp_srm_header) +
+           DRM_HDCP_1_4_VRL_LENGTH_SIZE + DRM_HDCP_1_4_DCP_SIG_SIZE)) {
+               DRM_ERROR("Invalid blob length\n");
+               return -EINVAL;
+       }
+
+       header = (struct hdcp_srm_header *)buf;
+       DRM_DEBUG("SRM ID: 0x%x, SRM Ver: 0x%x, SRM Gen No: 0x%x\n",
+                 header->srm_id,
+                 be16_to_cpu(header->srm_version), header->srm_gen_no);
+
+       WARN_ON(header->reserved);
+
+       buf = buf + sizeof(*header);
+       vrl_length = get_vrl_length(buf);
+       if (count < (sizeof(struct hdcp_srm_header) + vrl_length) ||
+           vrl_length < (DRM_HDCP_1_4_VRL_LENGTH_SIZE +
+                         DRM_HDCP_1_4_DCP_SIG_SIZE)) {
+               DRM_ERROR("Invalid blob length or vrl length\n");
+               return -EINVAL;
+       }
+
+       /* Length of the all vrls combined */
+       vrl_length -= (DRM_HDCP_1_4_VRL_LENGTH_SIZE +
+                      DRM_HDCP_1_4_DCP_SIG_SIZE);
+
+       if (!vrl_length) {
+               DRM_ERROR("No vrl found\n");
+               return -EINVAL;
+       }
+
+       buf += DRM_HDCP_1_4_VRL_LENGTH_SIZE;
+       ksv_count = drm_hdcp_get_revoked_ksv_count(buf, vrl_length);
+       if (!ksv_count) {
+               DRM_DEBUG("Revoked KSV count is 0\n");
+               return 0;
+       }
+
+       *revoked_ksv_list = kcalloc(ksv_count, DRM_HDCP_KSV_LEN, GFP_KERNEL);
+       if (!*revoked_ksv_list) {
+               DRM_ERROR("Out of Memory\n");
+               return -ENOMEM;
+       }
+
+       if (drm_hdcp_get_revoked_ksvs(buf, revoked_ksv_list,
+                                     vrl_length) != ksv_count) {
+               *revoked_ksv_cnt = 0;
+               kfree(*revoked_ksv_list);
+               return -EINVAL;
+       }
+
+       *revoked_ksv_cnt = ksv_count;
+       return 0;
+}
+
+static int drm_hdcp_parse_hdcp2_srm(const u8 *buf, size_t count,
+                                   u8 **revoked_ksv_list, u32 *revoked_ksv_cnt)
+{
+       struct hdcp_srm_header *header;
+       u32 vrl_length, ksv_count, ksv_sz;
+
+       if (count < (sizeof(struct hdcp_srm_header) +
+           DRM_HDCP_2_VRL_LENGTH_SIZE + DRM_HDCP_2_DCP_SIG_SIZE)) {
+               DRM_ERROR("Invalid blob length\n");
+               return -EINVAL;
+       }
+
+       header = (struct hdcp_srm_header *)buf;
+       DRM_DEBUG("SRM ID: 0x%x, SRM Ver: 0x%x, SRM Gen No: 0x%x\n",
+                 header->srm_id & DRM_HDCP_SRM_ID_MASK,
+                 be16_to_cpu(header->srm_version), header->srm_gen_no);
+
+       if (header->reserved)
+               return -EINVAL;
+
+       buf = buf + sizeof(*header);
+       vrl_length = get_vrl_length(buf);
+
+       if (count < (sizeof(struct hdcp_srm_header) + vrl_length) ||
+           vrl_length < (DRM_HDCP_2_VRL_LENGTH_SIZE +
+           DRM_HDCP_2_DCP_SIG_SIZE)) {
+               DRM_ERROR("Invalid blob length or vrl length\n");
+               return -EINVAL;
+       }
+
+       /* Length of the all vrls combined */
+       vrl_length -= (DRM_HDCP_2_VRL_LENGTH_SIZE +
+                      DRM_HDCP_2_DCP_SIG_SIZE);
+
+       if (!vrl_length) {
+               DRM_ERROR("No vrl found\n");
+               return -EINVAL;
+       }
+
+       buf += DRM_HDCP_2_VRL_LENGTH_SIZE;
+       ksv_count = (*buf << 2) | DRM_HDCP_2_KSV_COUNT_2_LSBITS(*(buf + 1));
+       if (!ksv_count) {
+               DRM_DEBUG("Revoked KSV count is 0\n");
+               return 0;
+       }
+
+       *revoked_ksv_list = kcalloc(ksv_count, DRM_HDCP_KSV_LEN, GFP_KERNEL);
+       if (!*revoked_ksv_list) {
+               DRM_ERROR("Out of Memory\n");
+               return -ENOMEM;
+       }
+
+       ksv_sz = ksv_count * DRM_HDCP_KSV_LEN;
+       buf += DRM_HDCP_2_NO_OF_DEV_PLUS_RESERVED_SZ;
+
+       DRM_DEBUG("Revoked KSVs: %d\n", ksv_count);
+       memcpy(*revoked_ksv_list, buf, ksv_sz);
+
+       *revoked_ksv_cnt = ksv_count;
+       return 0;
+}
+
+static inline bool is_srm_version_hdcp1(const u8 *buf)
+{
+       return *buf == (u8)(DRM_HDCP_1_4_SRM_ID << 4);
+}
+
+static inline bool is_srm_version_hdcp2(const u8 *buf)
+{
+       return *buf == (u8)(DRM_HDCP_2_SRM_ID << 4 | DRM_HDCP_2_INDICATOR);
+}
+
+static int drm_hdcp_srm_update(const u8 *buf, size_t count,
+                              u8 **revoked_ksv_list, u32 *revoked_ksv_cnt)
+{
+       if (count < sizeof(struct hdcp_srm_header))
+               return -EINVAL;
+
+       if (is_srm_version_hdcp1(buf))
+               return drm_hdcp_parse_hdcp1_srm(buf, count, revoked_ksv_list,
+                                               revoked_ksv_cnt);
+       else if (is_srm_version_hdcp2(buf))
+               return drm_hdcp_parse_hdcp2_srm(buf, count, revoked_ksv_list,
+                                               revoked_ksv_cnt);
+       else
+               return -EINVAL;
+}
+
+static int drm_hdcp_request_srm(struct drm_device *drm_dev,
+                               u8 **revoked_ksv_list, u32 *revoked_ksv_cnt)
+{
+       char fw_name[36] = "display_hdcp_srm.bin";
+       const struct firmware *fw;
+       int ret;
+
+       ret = request_firmware_direct(&fw, (const char *)fw_name,
+                                     drm_dev->dev);
+       if (ret < 0) {
+               *revoked_ksv_cnt = 0;
+               *revoked_ksv_list = NULL;
+               ret = 0;
+               goto exit;
+       }
+
+       if (fw->size && fw->data)
+               ret = drm_hdcp_srm_update(fw->data, fw->size, revoked_ksv_list,
+                                         revoked_ksv_cnt);
+
+exit:
+       release_firmware(fw);
+       return ret;
+}
+
+/**
+ * drm_hdcp_check_ksvs_revoked - Check the revoked status of the IDs
+ *
+ * @drm_dev: drm_device for which HDCP revocation check is requested
+ * @ksvs: List of KSVs (HDCP receiver IDs)
+ * @ksv_count: KSV count passed in through @ksvs
+ *
+ * This function reads the HDCP System renewability Message(SRM Table)
+ * from userspace as a firmware and parses it for the revoked HDCP
+ * KSVs(Receiver IDs) detected by DCP LLC. Once the revoked KSVs are known,
+ * revoked state of the KSVs in the list passed in by display drivers are
+ * decided and response is sent.
+ *
+ * SRM should be presented in the name of "display_hdcp_srm.bin".
+ *
+ * Format of the SRM table, that userspace needs to write into the binary file,
+ * is defined at:
+ * 1. Renewability chapter on 55th page of HDCP 1.4 specification
+ * https://www.digital-cp.com/sites/default/files/specifications/HDCP%20Specification%20Rev1_4_Secure.pdf
+ * 2. Renewability chapter on 63rd page of HDCP 2.2 specification
+ * https://www.digital-cp.com/sites/default/files/specifications/HDCP%20on%20HDMI%20Specification%20Rev2_2_Final1.pdf
+ *
+ * Returns:
+ * Count of the revoked KSVs or -ve error number in case of the failure.
+ */
+int drm_hdcp_check_ksvs_revoked(struct drm_device *drm_dev, u8 *ksvs,
+                               u32 ksv_count)
+{
+       u32 revoked_ksv_cnt = 0, i, j;
+       u8 *revoked_ksv_list = NULL;
+       int ret = 0;
+
+       ret = drm_hdcp_request_srm(drm_dev, &revoked_ksv_list,
+                                  &revoked_ksv_cnt);
+       if (ret)
+               return ret;
+
+       /* revoked_ksv_cnt will be zero when above function failed */
+       for (i = 0; i < revoked_ksv_cnt; i++)
+               for  (j = 0; j < ksv_count; j++)
+                       if (!memcmp(&ksvs[j * DRM_HDCP_KSV_LEN],
+                                   &revoked_ksv_list[i * DRM_HDCP_KSV_LEN],
+                                   DRM_HDCP_KSV_LEN)) {
+                               DRM_DEBUG("Revoked KSV is ");
+                               drm_hdcp_print_ksv(&ksvs[j * DRM_HDCP_KSV_LEN]);
+                               ret++;
+                       }
+
+       kfree(revoked_ksv_list);
+       return ret;
+}
+EXPORT_SYMBOL_GPL(drm_hdcp_check_ksvs_revoked);
+
+static struct drm_prop_enum_list drm_cp_enum_list[] = {
+       { DRM_MODE_CONTENT_PROTECTION_UNDESIRED, "Undesired" },
+       { DRM_MODE_CONTENT_PROTECTION_DESIRED, "Desired" },
+       { DRM_MODE_CONTENT_PROTECTION_ENABLED, "Enabled" },
+};
+DRM_ENUM_NAME_FN(drm_get_content_protection_name, drm_cp_enum_list)
+
+static struct drm_prop_enum_list drm_hdcp_content_type_enum_list[] = {
+       { DRM_MODE_HDCP_CONTENT_TYPE0, "HDCP Type0" },
+       { DRM_MODE_HDCP_CONTENT_TYPE1, "HDCP Type1" },
+};
+DRM_ENUM_NAME_FN(drm_get_hdcp_content_type_name,
+                drm_hdcp_content_type_enum_list)
+
+/**
+ * drm_connector_attach_content_protection_property - attach content protection
+ * property
+ *
+ * @connector: connector to attach CP property on.
+ * @hdcp_content_type: is HDCP Content Type property needed for connector
+ *
+ * This is used to add support for content protection on select connectors.
+ * Content Protection is intentionally vague to allow for different underlying
+ * technologies, however it is most implemented by HDCP.
+ *
+ * When hdcp_content_type is true enum property called HDCP Content Type is
+ * created (if it is not already) and attached to the connector.
+ *
+ * This property is used for sending the protected content's stream type
+ * from userspace to kernel on selected connectors. Protected content provider
+ * will decide their type of their content and declare the same to kernel.
+ *
+ * Content type will be used during the HDCP 2.2 authentication.
+ * Content type will be set to &drm_connector_state.hdcp_content_type.
+ *
+ * The content protection will be set to &drm_connector_state.content_protection
+ *
+ * When kernel triggered content protection state change like DESIRED->ENABLED
+ * and ENABLED->DESIRED, will use drm_hdcp_update_content_protection() to update
+ * the content protection state of a connector.
+ *
+ * Returns:
+ * Zero on success, negative errno on failure.
+ */
+int drm_connector_attach_content_protection_property(
+               struct drm_connector *connector, bool hdcp_content_type)
+{
+       struct drm_device *dev = connector->dev;
+       struct drm_property *prop =
+                       dev->mode_config.content_protection_property;
+
+       if (!prop)
+               prop = drm_property_create_enum(dev, 0, "Content Protection",
+                                               drm_cp_enum_list,
+                                               ARRAY_SIZE(drm_cp_enum_list));
+       if (!prop)
+               return -ENOMEM;
+
+       drm_object_attach_property(&connector->base, prop,
+                                  DRM_MODE_CONTENT_PROTECTION_UNDESIRED);
+       dev->mode_config.content_protection_property = prop;
+
+       if (!hdcp_content_type)
+               return 0;
+
+       prop = dev->mode_config.hdcp_content_type_property;
+       if (!prop)
+               prop = drm_property_create_enum(dev, 0, "HDCP Content Type",
+                                       drm_hdcp_content_type_enum_list,
+                                       ARRAY_SIZE(
+                                       drm_hdcp_content_type_enum_list));
+       if (!prop)
+               return -ENOMEM;
+
+       drm_object_attach_property(&connector->base, prop,
+                                  DRM_MODE_HDCP_CONTENT_TYPE0);
+       dev->mode_config.hdcp_content_type_property = prop;
+
+       return 0;
+}
+EXPORT_SYMBOL(drm_connector_attach_content_protection_property);
+
+/**
+ * drm_hdcp_update_content_protection - Updates the content protection state
+ * of a connector
+ *
+ * @connector: drm_connector on which content protection state needs an update
+ * @val: New state of the content protection property
+ *
+ * This function can be used by display drivers, to update the kernel triggered
+ * content protection state changes of a drm_connector such as DESIRED->ENABLED
+ * and ENABLED->DESIRED. No uevent for DESIRED->UNDESIRED or ENABLED->UNDESIRED,
+ * as userspace is triggering such state change and kernel performs it without
+ * fail.This function update the new state of the property into the connector's
+ * state and generate an uevent to notify the userspace.
+ */
+void drm_hdcp_update_content_protection(struct drm_connector *connector,
+                                       u64 val)
+{
+       struct drm_device *dev = connector->dev;
+       struct drm_connector_state *state = connector->state;
+
+       WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
+       if (state->content_protection == val)
+               return;
+
+       state->content_protection = val;
+       drm_sysfs_connector_status_event(connector,
+                                dev->mode_config.content_protection_property);
+}
+EXPORT_SYMBOL(drm_hdcp_update_content_protection);
diff --git a/drivers/gpu/drm/drm_hdcp.c b/drivers/gpu/drm/drm_hdcp.c
deleted file mode 100644 (file)
index ca9b8f6..0000000
+++ /dev/null
@@ -1,423 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (C) 2019 Intel Corporation.
- *
- * Authors:
- * Ramalingam C <ramalingam.c@intel.com>
- */
-
-#include <linux/device.h>
-#include <linux/err.h>
-#include <linux/gfp.h>
-#include <linux/export.h>
-#include <linux/slab.h>
-#include <linux/firmware.h>
-
-#include <drm/drm_hdcp.h>
-#include <drm/drm_sysfs.h>
-#include <drm/drm_print.h>
-#include <drm/drm_device.h>
-#include <drm/drm_property.h>
-#include <drm/drm_mode_object.h>
-#include <drm/drm_connector.h>
-
-#include "drm_internal.h"
-
-static inline void drm_hdcp_print_ksv(const u8 *ksv)
-{
-       DRM_DEBUG("\t%#02x, %#02x, %#02x, %#02x, %#02x\n",
-                 ksv[0], ksv[1], ksv[2], ksv[3], ksv[4]);
-}
-
-static u32 drm_hdcp_get_revoked_ksv_count(const u8 *buf, u32 vrls_length)
-{
-       u32 parsed_bytes = 0, ksv_count = 0, vrl_ksv_cnt, vrl_sz;
-
-       while (parsed_bytes < vrls_length) {
-               vrl_ksv_cnt = *buf;
-               ksv_count += vrl_ksv_cnt;
-
-               vrl_sz = (vrl_ksv_cnt * DRM_HDCP_KSV_LEN) + 1;
-               buf += vrl_sz;
-               parsed_bytes += vrl_sz;
-       }
-
-       /*
-        * When vrls are not valid, ksvs are not considered.
-        * Hence SRM will be discarded.
-        */
-       if (parsed_bytes != vrls_length)
-               ksv_count = 0;
-
-       return ksv_count;
-}
-
-static u32 drm_hdcp_get_revoked_ksvs(const u8 *buf, u8 **revoked_ksv_list,
-                                    u32 vrls_length)
-{
-       u32 vrl_ksv_cnt, vrl_ksv_sz, vrl_idx = 0;
-       u32 parsed_bytes = 0, ksv_count = 0;
-
-       do {
-               vrl_ksv_cnt = *buf;
-               vrl_ksv_sz = vrl_ksv_cnt * DRM_HDCP_KSV_LEN;
-
-               buf++;
-
-               DRM_DEBUG("vrl: %d, Revoked KSVs: %d\n", vrl_idx++,
-                         vrl_ksv_cnt);
-               memcpy((*revoked_ksv_list) + (ksv_count * DRM_HDCP_KSV_LEN),
-                      buf, vrl_ksv_sz);
-
-               ksv_count += vrl_ksv_cnt;
-               buf += vrl_ksv_sz;
-
-               parsed_bytes += (vrl_ksv_sz + 1);
-       } while (parsed_bytes < vrls_length);
-
-       return ksv_count;
-}
-
-static inline u32 get_vrl_length(const u8 *buf)
-{
-       return drm_hdcp_be24_to_cpu(buf);
-}
-
-static int drm_hdcp_parse_hdcp1_srm(const u8 *buf, size_t count,
-                                   u8 **revoked_ksv_list, u32 *revoked_ksv_cnt)
-{
-       struct hdcp_srm_header *header;
-       u32 vrl_length, ksv_count;
-
-       if (count < (sizeof(struct hdcp_srm_header) +
-           DRM_HDCP_1_4_VRL_LENGTH_SIZE + DRM_HDCP_1_4_DCP_SIG_SIZE)) {
-               DRM_ERROR("Invalid blob length\n");
-               return -EINVAL;
-       }
-
-       header = (struct hdcp_srm_header *)buf;
-       DRM_DEBUG("SRM ID: 0x%x, SRM Ver: 0x%x, SRM Gen No: 0x%x\n",
-                 header->srm_id,
-                 be16_to_cpu(header->srm_version), header->srm_gen_no);
-
-       WARN_ON(header->reserved);
-
-       buf = buf + sizeof(*header);
-       vrl_length = get_vrl_length(buf);
-       if (count < (sizeof(struct hdcp_srm_header) + vrl_length) ||
-           vrl_length < (DRM_HDCP_1_4_VRL_LENGTH_SIZE +
-                         DRM_HDCP_1_4_DCP_SIG_SIZE)) {
-               DRM_ERROR("Invalid blob length or vrl length\n");
-               return -EINVAL;
-       }
-
-       /* Length of the all vrls combined */
-       vrl_length -= (DRM_HDCP_1_4_VRL_LENGTH_SIZE +
-                      DRM_HDCP_1_4_DCP_SIG_SIZE);
-
-       if (!vrl_length) {
-               DRM_ERROR("No vrl found\n");
-               return -EINVAL;
-       }
-
-       buf += DRM_HDCP_1_4_VRL_LENGTH_SIZE;
-       ksv_count = drm_hdcp_get_revoked_ksv_count(buf, vrl_length);
-       if (!ksv_count) {
-               DRM_DEBUG("Revoked KSV count is 0\n");
-               return 0;
-       }
-
-       *revoked_ksv_list = kcalloc(ksv_count, DRM_HDCP_KSV_LEN, GFP_KERNEL);
-       if (!*revoked_ksv_list) {
-               DRM_ERROR("Out of Memory\n");
-               return -ENOMEM;
-       }
-
-       if (drm_hdcp_get_revoked_ksvs(buf, revoked_ksv_list,
-                                     vrl_length) != ksv_count) {
-               *revoked_ksv_cnt = 0;
-               kfree(*revoked_ksv_list);
-               return -EINVAL;
-       }
-
-       *revoked_ksv_cnt = ksv_count;
-       return 0;
-}
-
-static int drm_hdcp_parse_hdcp2_srm(const u8 *buf, size_t count,
-                                   u8 **revoked_ksv_list, u32 *revoked_ksv_cnt)
-{
-       struct hdcp_srm_header *header;
-       u32 vrl_length, ksv_count, ksv_sz;
-
-       if (count < (sizeof(struct hdcp_srm_header) +
-           DRM_HDCP_2_VRL_LENGTH_SIZE + DRM_HDCP_2_DCP_SIG_SIZE)) {
-               DRM_ERROR("Invalid blob length\n");
-               return -EINVAL;
-       }
-
-       header = (struct hdcp_srm_header *)buf;
-       DRM_DEBUG("SRM ID: 0x%x, SRM Ver: 0x%x, SRM Gen No: 0x%x\n",
-                 header->srm_id & DRM_HDCP_SRM_ID_MASK,
-                 be16_to_cpu(header->srm_version), header->srm_gen_no);
-
-       if (header->reserved)
-               return -EINVAL;
-
-       buf = buf + sizeof(*header);
-       vrl_length = get_vrl_length(buf);
-
-       if (count < (sizeof(struct hdcp_srm_header) + vrl_length) ||
-           vrl_length < (DRM_HDCP_2_VRL_LENGTH_SIZE +
-           DRM_HDCP_2_DCP_SIG_SIZE)) {
-               DRM_ERROR("Invalid blob length or vrl length\n");
-               return -EINVAL;
-       }
-
-       /* Length of the all vrls combined */
-       vrl_length -= (DRM_HDCP_2_VRL_LENGTH_SIZE +
-                      DRM_HDCP_2_DCP_SIG_SIZE);
-
-       if (!vrl_length) {
-               DRM_ERROR("No vrl found\n");
-               return -EINVAL;
-       }
-
-       buf += DRM_HDCP_2_VRL_LENGTH_SIZE;
-       ksv_count = (*buf << 2) | DRM_HDCP_2_KSV_COUNT_2_LSBITS(*(buf + 1));
-       if (!ksv_count) {
-               DRM_DEBUG("Revoked KSV count is 0\n");
-               return 0;
-       }
-
-       *revoked_ksv_list = kcalloc(ksv_count, DRM_HDCP_KSV_LEN, GFP_KERNEL);
-       if (!*revoked_ksv_list) {
-               DRM_ERROR("Out of Memory\n");
-               return -ENOMEM;
-       }
-
-       ksv_sz = ksv_count * DRM_HDCP_KSV_LEN;
-       buf += DRM_HDCP_2_NO_OF_DEV_PLUS_RESERVED_SZ;
-
-       DRM_DEBUG("Revoked KSVs: %d\n", ksv_count);
-       memcpy(*revoked_ksv_list, buf, ksv_sz);
-
-       *revoked_ksv_cnt = ksv_count;
-       return 0;
-}
-
-static inline bool is_srm_version_hdcp1(const u8 *buf)
-{
-       return *buf == (u8)(DRM_HDCP_1_4_SRM_ID << 4);
-}
-
-static inline bool is_srm_version_hdcp2(const u8 *buf)
-{
-       return *buf == (u8)(DRM_HDCP_2_SRM_ID << 4 | DRM_HDCP_2_INDICATOR);
-}
-
-static int drm_hdcp_srm_update(const u8 *buf, size_t count,
-                              u8 **revoked_ksv_list, u32 *revoked_ksv_cnt)
-{
-       if (count < sizeof(struct hdcp_srm_header))
-               return -EINVAL;
-
-       if (is_srm_version_hdcp1(buf))
-               return drm_hdcp_parse_hdcp1_srm(buf, count, revoked_ksv_list,
-                                               revoked_ksv_cnt);
-       else if (is_srm_version_hdcp2(buf))
-               return drm_hdcp_parse_hdcp2_srm(buf, count, revoked_ksv_list,
-                                               revoked_ksv_cnt);
-       else
-               return -EINVAL;
-}
-
-static int drm_hdcp_request_srm(struct drm_device *drm_dev,
-                               u8 **revoked_ksv_list, u32 *revoked_ksv_cnt)
-{
-       char fw_name[36] = "display_hdcp_srm.bin";
-       const struct firmware *fw;
-       int ret;
-
-       ret = request_firmware_direct(&fw, (const char *)fw_name,
-                                     drm_dev->dev);
-       if (ret < 0) {
-               *revoked_ksv_cnt = 0;
-               *revoked_ksv_list = NULL;
-               ret = 0;
-               goto exit;
-       }
-
-       if (fw->size && fw->data)
-               ret = drm_hdcp_srm_update(fw->data, fw->size, revoked_ksv_list,
-                                         revoked_ksv_cnt);
-
-exit:
-       release_firmware(fw);
-       return ret;
-}
-
-/**
- * drm_hdcp_check_ksvs_revoked - Check the revoked status of the IDs
- *
- * @drm_dev: drm_device for which HDCP revocation check is requested
- * @ksvs: List of KSVs (HDCP receiver IDs)
- * @ksv_count: KSV count passed in through @ksvs
- *
- * This function reads the HDCP System renewability Message(SRM Table)
- * from userspace as a firmware and parses it for the revoked HDCP
- * KSVs(Receiver IDs) detected by DCP LLC. Once the revoked KSVs are known,
- * revoked state of the KSVs in the list passed in by display drivers are
- * decided and response is sent.
- *
- * SRM should be presented in the name of "display_hdcp_srm.bin".
- *
- * Format of the SRM table, that userspace needs to write into the binary file,
- * is defined at:
- * 1. Renewability chapter on 55th page of HDCP 1.4 specification
- * https://www.digital-cp.com/sites/default/files/specifications/HDCP%20Specification%20Rev1_4_Secure.pdf
- * 2. Renewability chapter on 63rd page of HDCP 2.2 specification
- * https://www.digital-cp.com/sites/default/files/specifications/HDCP%20on%20HDMI%20Specification%20Rev2_2_Final1.pdf
- *
- * Returns:
- * Count of the revoked KSVs or -ve error number in case of the failure.
- */
-int drm_hdcp_check_ksvs_revoked(struct drm_device *drm_dev, u8 *ksvs,
-                               u32 ksv_count)
-{
-       u32 revoked_ksv_cnt = 0, i, j;
-       u8 *revoked_ksv_list = NULL;
-       int ret = 0;
-
-       ret = drm_hdcp_request_srm(drm_dev, &revoked_ksv_list,
-                                  &revoked_ksv_cnt);
-       if (ret)
-               return ret;
-
-       /* revoked_ksv_cnt will be zero when above function failed */
-       for (i = 0; i < revoked_ksv_cnt; i++)
-               for  (j = 0; j < ksv_count; j++)
-                       if (!memcmp(&ksvs[j * DRM_HDCP_KSV_LEN],
-                                   &revoked_ksv_list[i * DRM_HDCP_KSV_LEN],
-                                   DRM_HDCP_KSV_LEN)) {
-                               DRM_DEBUG("Revoked KSV is ");
-                               drm_hdcp_print_ksv(&ksvs[j * DRM_HDCP_KSV_LEN]);
-                               ret++;
-                       }
-
-       kfree(revoked_ksv_list);
-       return ret;
-}
-EXPORT_SYMBOL_GPL(drm_hdcp_check_ksvs_revoked);
-
-static struct drm_prop_enum_list drm_cp_enum_list[] = {
-       { DRM_MODE_CONTENT_PROTECTION_UNDESIRED, "Undesired" },
-       { DRM_MODE_CONTENT_PROTECTION_DESIRED, "Desired" },
-       { DRM_MODE_CONTENT_PROTECTION_ENABLED, "Enabled" },
-};
-DRM_ENUM_NAME_FN(drm_get_content_protection_name, drm_cp_enum_list)
-
-static struct drm_prop_enum_list drm_hdcp_content_type_enum_list[] = {
-       { DRM_MODE_HDCP_CONTENT_TYPE0, "HDCP Type0" },
-       { DRM_MODE_HDCP_CONTENT_TYPE1, "HDCP Type1" },
-};
-DRM_ENUM_NAME_FN(drm_get_hdcp_content_type_name,
-                drm_hdcp_content_type_enum_list)
-
-/**
- * drm_connector_attach_content_protection_property - attach content protection
- * property
- *
- * @connector: connector to attach CP property on.
- * @hdcp_content_type: is HDCP Content Type property needed for connector
- *
- * This is used to add support for content protection on select connectors.
- * Content Protection is intentionally vague to allow for different underlying
- * technologies, however it is most implemented by HDCP.
- *
- * When hdcp_content_type is true enum property called HDCP Content Type is
- * created (if it is not already) and attached to the connector.
- *
- * This property is used for sending the protected content's stream type
- * from userspace to kernel on selected connectors. Protected content provider
- * will decide their type of their content and declare the same to kernel.
- *
- * Content type will be used during the HDCP 2.2 authentication.
- * Content type will be set to &drm_connector_state.hdcp_content_type.
- *
- * The content protection will be set to &drm_connector_state.content_protection
- *
- * When kernel triggered content protection state change like DESIRED->ENABLED
- * and ENABLED->DESIRED, will use drm_hdcp_update_content_protection() to update
- * the content protection state of a connector.
- *
- * Returns:
- * Zero on success, negative errno on failure.
- */
-int drm_connector_attach_content_protection_property(
-               struct drm_connector *connector, bool hdcp_content_type)
-{
-       struct drm_device *dev = connector->dev;
-       struct drm_property *prop =
-                       dev->mode_config.content_protection_property;
-
-       if (!prop)
-               prop = drm_property_create_enum(dev, 0, "Content Protection",
-                                               drm_cp_enum_list,
-                                               ARRAY_SIZE(drm_cp_enum_list));
-       if (!prop)
-               return -ENOMEM;
-
-       drm_object_attach_property(&connector->base, prop,
-                                  DRM_MODE_CONTENT_PROTECTION_UNDESIRED);
-       dev->mode_config.content_protection_property = prop;
-
-       if (!hdcp_content_type)
-               return 0;
-
-       prop = dev->mode_config.hdcp_content_type_property;
-       if (!prop)
-               prop = drm_property_create_enum(dev, 0, "HDCP Content Type",
-                                       drm_hdcp_content_type_enum_list,
-                                       ARRAY_SIZE(
-                                       drm_hdcp_content_type_enum_list));
-       if (!prop)
-               return -ENOMEM;
-
-       drm_object_attach_property(&connector->base, prop,
-                                  DRM_MODE_HDCP_CONTENT_TYPE0);
-       dev->mode_config.hdcp_content_type_property = prop;
-
-       return 0;
-}
-EXPORT_SYMBOL(drm_connector_attach_content_protection_property);
-
-/**
- * drm_hdcp_update_content_protection - Updates the content protection state
- * of a connector
- *
- * @connector: drm_connector on which content protection state needs an update
- * @val: New state of the content protection property
- *
- * This function can be used by display drivers, to update the kernel triggered
- * content protection state changes of a drm_connector such as DESIRED->ENABLED
- * and ENABLED->DESIRED. No uevent for DESIRED->UNDESIRED or ENABLED->UNDESIRED,
- * as userspace is triggering such state change and kernel performs it without
- * fail.This function update the new state of the property into the connector's
- * state and generate an uevent to notify the userspace.
- */
-void drm_hdcp_update_content_protection(struct drm_connector *connector,
-                                       u64 val)
-{
-       struct drm_device *dev = connector->dev;
-       struct drm_connector_state *state = connector->state;
-
-       WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
-       if (state->content_protection == val)
-               return;
-
-       state->content_protection = val;
-       drm_sysfs_connector_status_event(connector,
-                                dev->mode_config.content_protection_property);
-}
-EXPORT_SYMBOL(drm_hdcp_update_content_protection);
index 883284ca0a29fd966826b2d4349ff6b66aa686fc..a78d82cccbffb6ac3476820554a56a99dd48508d 100644 (file)
@@ -11,6 +11,7 @@ config DRM_I915
        select SHMEM
        select TMPFS
        select DRM_DISPLAY_DP_HELPER
+       select DRM_DISPLAY_HDCP_HELPER
        select DRM_DISPLAY_HELPER
        select DRM_KMS_HELPER
        select DRM_PANEL
index 598cad09d49908e4078470700233d20c4a162389..a7640dbcf00ec7a60a0da6f79ebda53579cf414a 100644 (file)
@@ -8,7 +8,7 @@
 
 #include <drm/display/drm_dp_helper.h>
 #include <drm/display/drm_dp_mst_helper.h>
-#include <drm/drm_hdcp.h>
+#include <drm/display/drm_hdcp_helper.h>
 #include <drm/drm_print.h>
 
 #include "intel_ddi.h"
index 21281a7bdc17be481fbdf443c7ed78d9d7b42120..a6ba7fb723397557465b4b2fc2e1976828ff7d40 100644 (file)
@@ -31,7 +31,7 @@
 #include <linux/i2c-algo-bit.h>
 #include <linux/i2c.h>
 
-#include <drm/drm_hdcp.h>
+#include <drm/display/drm_hdcp_helper.h>
 
 #include "i915_drv.h"
 #include "intel_de.h"
index 4de4c174a987d711402a9d69b33c82f517c2a2d5..44ac0cee8b7787db671ca2f2f72d4bfa2bc0c6fc 100644 (file)
@@ -12,7 +12,7 @@
 #include <linux/i2c.h>
 #include <linux/random.h>
 
-#include <drm/drm_hdcp.h>
+#include <drm/display/drm_hdcp_helper.h>
 #include <drm/i915_component.h>
 
 #include "i915_drv.h"
index a4a6f8bd2841e64a6fe56a3ff0e3d94cf3cdce5e..c713cebc63fefca1f64392c0958c5ccc61969b7f 100644 (file)
 #include <linux/slab.h>
 #include <linux/string_helpers.h>
 
+#include <drm/display/drm_hdcp_helper.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_edid.h>
-#include <drm/drm_hdcp.h>
 #include <drm/drm_scdc_helper.h>
 #include <drm/intel_lpe_audio.h>
 
index 834757f5e0723ff4e99768d1a8d589743150777b..ca09c8f83d6b921046c9202a52003ac71fc05b9c 100644 (file)
@@ -9,7 +9,7 @@
 #ifndef __MEI_HDCP_H__
 #define __MEI_HDCP_H__
 
-#include <drm/drm_hdcp.h>
+#include <drm/display/drm_hdcp.h>
 
 /* me_hdcp_status: Enumeration of all HDCP Status Codes */
 enum me_hdcp_status {
diff --git a/include/drm/display/drm_hdcp.h b/include/drm/display/drm_hdcp.h
new file mode 100644 (file)
index 0000000..96a99b1
--- /dev/null
@@ -0,0 +1,298 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright (C) 2017 Google, Inc.
+ *
+ * Authors:
+ * Sean Paul <seanpaul@chromium.org>
+ */
+
+#ifndef _DRM_HDCP_H_
+#define _DRM_HDCP_H_
+
+#include <linux/types.h>
+
+/* Period of hdcp checks (to ensure we're still authenticated) */
+#define DRM_HDCP_CHECK_PERIOD_MS               (128 * 16)
+#define DRM_HDCP2_CHECK_PERIOD_MS              500
+
+/* Shared lengths/masks between HDMI/DVI/DisplayPort */
+#define DRM_HDCP_AN_LEN                                8
+#define DRM_HDCP_BSTATUS_LEN                   2
+#define DRM_HDCP_KSV_LEN                       5
+#define DRM_HDCP_RI_LEN                                2
+#define DRM_HDCP_V_PRIME_PART_LEN              4
+#define DRM_HDCP_V_PRIME_NUM_PARTS             5
+#define DRM_HDCP_NUM_DOWNSTREAM(x)             (x & 0x7f)
+#define DRM_HDCP_MAX_CASCADE_EXCEEDED(x)       (x & BIT(3))
+#define DRM_HDCP_MAX_DEVICE_EXCEEDED(x)                (x & BIT(7))
+
+/* Slave address for the HDCP registers in the receiver */
+#define DRM_HDCP_DDC_ADDR                      0x3A
+
+/* Value to use at the end of the SHA-1 bytestream used for repeaters */
+#define DRM_HDCP_SHA1_TERMINATOR               0x80
+
+/* HDCP register offsets for HDMI/DVI devices */
+#define DRM_HDCP_DDC_BKSV                      0x00
+#define DRM_HDCP_DDC_RI_PRIME                  0x08
+#define DRM_HDCP_DDC_AKSV                      0x10
+#define DRM_HDCP_DDC_AN                                0x18
+#define DRM_HDCP_DDC_V_PRIME(h)                        (0x20 + h * 4)
+#define DRM_HDCP_DDC_BCAPS                     0x40
+#define  DRM_HDCP_DDC_BCAPS_REPEATER_PRESENT   BIT(6)
+#define  DRM_HDCP_DDC_BCAPS_KSV_FIFO_READY     BIT(5)
+#define DRM_HDCP_DDC_BSTATUS                   0x41
+#define DRM_HDCP_DDC_KSV_FIFO                  0x43
+
+#define DRM_HDCP_1_4_SRM_ID                    0x8
+#define DRM_HDCP_1_4_VRL_LENGTH_SIZE           3
+#define DRM_HDCP_1_4_DCP_SIG_SIZE              40
+
+/* Protocol message definition for HDCP2.2 specification */
+/*
+ * Protected content streams are classified into 2 types:
+ * - Type0: Can be transmitted with HDCP 1.4+
+ * - Type1: Can be transmitted with HDCP 2.2+
+ */
+#define HDCP_STREAM_TYPE0                      0x00
+#define HDCP_STREAM_TYPE1                      0x01
+
+/* HDCP2.2 Msg IDs */
+#define HDCP_2_2_NULL_MSG                      1
+#define HDCP_2_2_AKE_INIT                      2
+#define HDCP_2_2_AKE_SEND_CERT                 3
+#define HDCP_2_2_AKE_NO_STORED_KM              4
+#define HDCP_2_2_AKE_STORED_KM                 5
+#define HDCP_2_2_AKE_SEND_HPRIME               7
+#define HDCP_2_2_AKE_SEND_PAIRING_INFO         8
+#define HDCP_2_2_LC_INIT                       9
+#define HDCP_2_2_LC_SEND_LPRIME                        10
+#define HDCP_2_2_SKE_SEND_EKS                  11
+#define HDCP_2_2_REP_SEND_RECVID_LIST          12
+#define HDCP_2_2_REP_SEND_ACK                  15
+#define HDCP_2_2_REP_STREAM_MANAGE             16
+#define HDCP_2_2_REP_STREAM_READY              17
+
+#define HDCP_2_2_RTX_LEN                       8
+#define HDCP_2_2_RRX_LEN                       8
+
+#define HDCP_2_2_K_PUB_RX_MOD_N_LEN            128
+#define HDCP_2_2_K_PUB_RX_EXP_E_LEN            3
+#define HDCP_2_2_K_PUB_RX_LEN                  (HDCP_2_2_K_PUB_RX_MOD_N_LEN + \
+                                                HDCP_2_2_K_PUB_RX_EXP_E_LEN)
+
+#define HDCP_2_2_DCP_LLC_SIG_LEN               384
+
+#define HDCP_2_2_E_KPUB_KM_LEN                 128
+#define HDCP_2_2_E_KH_KM_M_LEN                 (16 + 16)
+#define HDCP_2_2_H_PRIME_LEN                   32
+#define HDCP_2_2_E_KH_KM_LEN                   16
+#define HDCP_2_2_RN_LEN                                8
+#define HDCP_2_2_L_PRIME_LEN                   32
+#define HDCP_2_2_E_DKEY_KS_LEN                 16
+#define HDCP_2_2_RIV_LEN                       8
+#define HDCP_2_2_SEQ_NUM_LEN                   3
+#define HDCP_2_2_V_PRIME_HALF_LEN              (HDCP_2_2_L_PRIME_LEN / 2)
+#define HDCP_2_2_RECEIVER_ID_LEN               DRM_HDCP_KSV_LEN
+#define HDCP_2_2_MAX_DEVICE_COUNT              31
+#define HDCP_2_2_RECEIVER_IDS_MAX_LEN          (HDCP_2_2_RECEIVER_ID_LEN * \
+                                                HDCP_2_2_MAX_DEVICE_COUNT)
+#define HDCP_2_2_MPRIME_LEN                    32
+
+/* Following Macros take a byte at a time for bit(s) masking */
+/*
+ * TODO: HDCP_2_2_MAX_CONTENT_STREAMS_CNT is based upon actual
+ * H/W MST streams capacity.
+ * This required to be moved out to platform specific header.
+ */
+#define HDCP_2_2_MAX_CONTENT_STREAMS_CNT       4
+#define HDCP_2_2_TXCAP_MASK_LEN                        2
+#define HDCP_2_2_RXCAPS_LEN                    3
+#define HDCP_2_2_RX_REPEATER(x)                        ((x) & BIT(0))
+#define HDCP_2_2_DP_HDCP_CAPABLE(x)            ((x) & BIT(1))
+#define HDCP_2_2_RXINFO_LEN                    2
+
+/* HDCP1.x compliant device in downstream */
+#define HDCP_2_2_HDCP1_DEVICE_CONNECTED(x)     ((x) & BIT(0))
+
+/* HDCP2.0 Compliant repeater in downstream */
+#define HDCP_2_2_HDCP_2_0_REP_CONNECTED(x)     ((x) & BIT(1))
+#define HDCP_2_2_MAX_CASCADE_EXCEEDED(x)       ((x) & BIT(2))
+#define HDCP_2_2_MAX_DEVS_EXCEEDED(x)          ((x) & BIT(3))
+#define HDCP_2_2_DEV_COUNT_LO(x)               (((x) & (0xF << 4)) >> 4)
+#define HDCP_2_2_DEV_COUNT_HI(x)               ((x) & BIT(0))
+#define HDCP_2_2_DEPTH(x)                      (((x) & (0x7 << 1)) >> 1)
+
+struct hdcp2_cert_rx {
+       u8      receiver_id[HDCP_2_2_RECEIVER_ID_LEN];
+       u8      kpub_rx[HDCP_2_2_K_PUB_RX_LEN];
+       u8      reserved[2];
+       u8      dcp_signature[HDCP_2_2_DCP_LLC_SIG_LEN];
+} __packed;
+
+struct hdcp2_streamid_type {
+       u8      stream_id;
+       u8      stream_type;
+} __packed;
+
+/*
+ * The TxCaps field specified in the HDCP HDMI, DP specs
+ * This field is big endian as specified in the errata.
+ */
+struct hdcp2_tx_caps {
+       /* Transmitter must set this to 0x2 */
+       u8      version;
+
+       /* Reserved for HDCP and DP Spec. Read as Zero */
+       u8      tx_cap_mask[HDCP_2_2_TXCAP_MASK_LEN];
+} __packed;
+
+/* Main structures for HDCP2.2 protocol communication */
+struct hdcp2_ake_init {
+       u8                      msg_id;
+       u8                      r_tx[HDCP_2_2_RTX_LEN];
+       struct hdcp2_tx_caps    tx_caps;
+} __packed;
+
+struct hdcp2_ake_send_cert {
+       u8                      msg_id;
+       struct hdcp2_cert_rx    cert_rx;
+       u8                      r_rx[HDCP_2_2_RRX_LEN];
+       u8                      rx_caps[HDCP_2_2_RXCAPS_LEN];
+} __packed;
+
+struct hdcp2_ake_no_stored_km {
+       u8      msg_id;
+       u8      e_kpub_km[HDCP_2_2_E_KPUB_KM_LEN];
+} __packed;
+
+struct hdcp2_ake_stored_km {
+       u8      msg_id;
+       u8      e_kh_km_m[HDCP_2_2_E_KH_KM_M_LEN];
+} __packed;
+
+struct hdcp2_ake_send_hprime {
+       u8      msg_id;
+       u8      h_prime[HDCP_2_2_H_PRIME_LEN];
+} __packed;
+
+struct hdcp2_ake_send_pairing_info {
+       u8      msg_id;
+       u8      e_kh_km[HDCP_2_2_E_KH_KM_LEN];
+} __packed;
+
+struct hdcp2_lc_init {
+       u8      msg_id;
+       u8      r_n[HDCP_2_2_RN_LEN];
+} __packed;
+
+struct hdcp2_lc_send_lprime {
+       u8      msg_id;
+       u8      l_prime[HDCP_2_2_L_PRIME_LEN];
+} __packed;
+
+struct hdcp2_ske_send_eks {
+       u8      msg_id;
+       u8      e_dkey_ks[HDCP_2_2_E_DKEY_KS_LEN];
+       u8      riv[HDCP_2_2_RIV_LEN];
+} __packed;
+
+struct hdcp2_rep_send_receiverid_list {
+       u8      msg_id;
+       u8      rx_info[HDCP_2_2_RXINFO_LEN];
+       u8      seq_num_v[HDCP_2_2_SEQ_NUM_LEN];
+       u8      v_prime[HDCP_2_2_V_PRIME_HALF_LEN];
+       u8      receiver_ids[HDCP_2_2_RECEIVER_IDS_MAX_LEN];
+} __packed;
+
+struct hdcp2_rep_send_ack {
+       u8      msg_id;
+       u8      v[HDCP_2_2_V_PRIME_HALF_LEN];
+} __packed;
+
+struct hdcp2_rep_stream_manage {
+       u8                      msg_id;
+       u8                      seq_num_m[HDCP_2_2_SEQ_NUM_LEN];
+       __be16                  k;
+       struct hdcp2_streamid_type streams[HDCP_2_2_MAX_CONTENT_STREAMS_CNT];
+} __packed;
+
+struct hdcp2_rep_stream_ready {
+       u8      msg_id;
+       u8      m_prime[HDCP_2_2_MPRIME_LEN];
+} __packed;
+
+/* HDCP2.2 TIMEOUTs in mSec */
+#define HDCP_2_2_CERT_TIMEOUT_MS               100
+#define HDCP_2_2_DP_CERT_READ_TIMEOUT_MS       110
+#define HDCP_2_2_HPRIME_NO_PAIRED_TIMEOUT_MS   1000
+#define HDCP_2_2_HPRIME_PAIRED_TIMEOUT_MS      200
+#define HDCP_2_2_DP_HPRIME_READ_TIMEOUT_MS     7
+#define HDCP_2_2_PAIRING_TIMEOUT_MS            200
+#define HDCP_2_2_DP_PAIRING_READ_TIMEOUT_MS    5
+#define        HDCP_2_2_HDMI_LPRIME_TIMEOUT_MS         20
+#define HDCP_2_2_DP_LPRIME_TIMEOUT_MS          16
+#define HDCP_2_2_RECVID_LIST_TIMEOUT_MS                3000
+#define HDCP_2_2_STREAM_READY_TIMEOUT_MS       100
+
+/* HDMI HDCP2.2 Register Offsets */
+#define HDCP_2_2_HDMI_REG_VER_OFFSET           0x50
+#define HDCP_2_2_HDMI_REG_WR_MSG_OFFSET                0x60
+#define HDCP_2_2_HDMI_REG_RXSTATUS_OFFSET      0x70
+#define HDCP_2_2_HDMI_REG_RD_MSG_OFFSET                0x80
+#define HDCP_2_2_HDMI_REG_DBG_OFFSET           0xC0
+
+#define HDCP_2_2_HDMI_SUPPORT_MASK             BIT(2)
+#define HDCP_2_2_RX_CAPS_VERSION_VAL           0x02
+#define HDCP_2_2_SEQ_NUM_MAX                   0xFFFFFF
+#define        HDCP_2_2_DELAY_BEFORE_ENCRYPTION_EN     200
+
+/* Below macros take a byte at a time and mask the bit(s) */
+#define HDCP_2_2_HDMI_RXSTATUS_LEN             2
+#define HDCP_2_2_HDMI_RXSTATUS_MSG_SZ_HI(x)    ((x) & 0x3)
+#define HDCP_2_2_HDMI_RXSTATUS_READY(x)                ((x) & BIT(2))
+#define HDCP_2_2_HDMI_RXSTATUS_REAUTH_REQ(x)   ((x) & BIT(3))
+
+/*
+ * Helper functions to convert 24bit big endian hdcp sequence number to
+ * host format and back
+ */
+static inline
+u32 drm_hdcp_be24_to_cpu(const u8 seq_num[HDCP_2_2_SEQ_NUM_LEN])
+{
+       return (u32)(seq_num[2] | seq_num[1] << 8 | seq_num[0] << 16);
+}
+
+static inline
+void drm_hdcp_cpu_to_be24(u8 seq_num[HDCP_2_2_SEQ_NUM_LEN], u32 val)
+{
+       seq_num[0] = val >> 16;
+       seq_num[1] = val >> 8;
+       seq_num[2] = val;
+}
+
+#define DRM_HDCP_SRM_GEN1_MAX_BYTES            (5 * 1024)
+#define DRM_HDCP_1_4_SRM_ID                    0x8
+#define DRM_HDCP_SRM_ID_MASK                   (0xF << 4)
+#define DRM_HDCP_1_4_VRL_LENGTH_SIZE           3
+#define DRM_HDCP_1_4_DCP_SIG_SIZE              40
+#define DRM_HDCP_2_SRM_ID                      0x9
+#define DRM_HDCP_2_INDICATOR                   0x1
+#define DRM_HDCP_2_INDICATOR_MASK              0xF
+#define DRM_HDCP_2_VRL_LENGTH_SIZE             3
+#define DRM_HDCP_2_DCP_SIG_SIZE                        384
+#define DRM_HDCP_2_NO_OF_DEV_PLUS_RESERVED_SZ  4
+#define DRM_HDCP_2_KSV_COUNT_2_LSBITS(byte)    (((byte) & 0xC0) >> 6)
+
+struct hdcp_srm_header {
+       u8 srm_id;
+       u8 reserved;
+       __be16 srm_version;
+       u8 srm_gen_no;
+} __packed;
+
+/* Content Type classification for HDCP2.2 vs others */
+#define DRM_MODE_HDCP_CONTENT_TYPE0            0
+#define DRM_MODE_HDCP_CONTENT_TYPE1            1
+
+#endif
diff --git a/include/drm/display/drm_hdcp_helper.h b/include/drm/display/drm_hdcp_helper.h
new file mode 100644 (file)
index 0000000..8aaf87b
--- /dev/null
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright (C) 2017 Google, Inc.
+ *
+ * Authors:
+ * Sean Paul <seanpaul@chromium.org>
+ */
+
+#ifndef _DRM_HDCP_HELPER_H_INCLUDED_
+#define _DRM_HDCP_HELPER_H_INCLUDED_
+
+#include <drm/display/drm_hdcp.h>
+
+struct drm_device;
+struct drm_connector;
+
+int drm_hdcp_check_ksvs_revoked(struct drm_device *dev, u8 *ksvs, u32 ksv_count);
+int drm_connector_attach_content_protection_property(struct drm_connector *connector,
+                                                    bool hdcp_content_type);
+void drm_hdcp_update_content_protection(struct drm_connector *connector, u64 val);
+
+#endif
diff --git a/include/drm/drm_hdcp.h b/include/drm/drm_hdcp.h
deleted file mode 100644 (file)
index 0b1111e..0000000
+++ /dev/null
@@ -1,308 +0,0 @@
-/* SPDX-License-Identifier: MIT */
-/*
- * Copyright (C) 2017 Google, Inc.
- *
- * Authors:
- * Sean Paul <seanpaul@chromium.org>
- */
-
-#ifndef _DRM_HDCP_H_INCLUDED_
-#define _DRM_HDCP_H_INCLUDED_
-
-#include <linux/types.h>
-
-/* Period of hdcp checks (to ensure we're still authenticated) */
-#define DRM_HDCP_CHECK_PERIOD_MS               (128 * 16)
-#define DRM_HDCP2_CHECK_PERIOD_MS              500
-
-/* Shared lengths/masks between HDMI/DVI/DisplayPort */
-#define DRM_HDCP_AN_LEN                                8
-#define DRM_HDCP_BSTATUS_LEN                   2
-#define DRM_HDCP_KSV_LEN                       5
-#define DRM_HDCP_RI_LEN                                2
-#define DRM_HDCP_V_PRIME_PART_LEN              4
-#define DRM_HDCP_V_PRIME_NUM_PARTS             5
-#define DRM_HDCP_NUM_DOWNSTREAM(x)             (x & 0x7f)
-#define DRM_HDCP_MAX_CASCADE_EXCEEDED(x)       (x & BIT(3))
-#define DRM_HDCP_MAX_DEVICE_EXCEEDED(x)                (x & BIT(7))
-
-/* Slave address for the HDCP registers in the receiver */
-#define DRM_HDCP_DDC_ADDR                      0x3A
-
-/* Value to use at the end of the SHA-1 bytestream used for repeaters */
-#define DRM_HDCP_SHA1_TERMINATOR               0x80
-
-/* HDCP register offsets for HDMI/DVI devices */
-#define DRM_HDCP_DDC_BKSV                      0x00
-#define DRM_HDCP_DDC_RI_PRIME                  0x08
-#define DRM_HDCP_DDC_AKSV                      0x10
-#define DRM_HDCP_DDC_AN                                0x18
-#define DRM_HDCP_DDC_V_PRIME(h)                        (0x20 + h * 4)
-#define DRM_HDCP_DDC_BCAPS                     0x40
-#define  DRM_HDCP_DDC_BCAPS_REPEATER_PRESENT   BIT(6)
-#define  DRM_HDCP_DDC_BCAPS_KSV_FIFO_READY     BIT(5)
-#define DRM_HDCP_DDC_BSTATUS                   0x41
-#define DRM_HDCP_DDC_KSV_FIFO                  0x43
-
-#define DRM_HDCP_1_4_SRM_ID                    0x8
-#define DRM_HDCP_1_4_VRL_LENGTH_SIZE           3
-#define DRM_HDCP_1_4_DCP_SIG_SIZE              40
-
-/* Protocol message definition for HDCP2.2 specification */
-/*
- * Protected content streams are classified into 2 types:
- * - Type0: Can be transmitted with HDCP 1.4+
- * - Type1: Can be transmitted with HDCP 2.2+
- */
-#define HDCP_STREAM_TYPE0                      0x00
-#define HDCP_STREAM_TYPE1                      0x01
-
-/* HDCP2.2 Msg IDs */
-#define HDCP_2_2_NULL_MSG                      1
-#define HDCP_2_2_AKE_INIT                      2
-#define HDCP_2_2_AKE_SEND_CERT                 3
-#define HDCP_2_2_AKE_NO_STORED_KM              4
-#define HDCP_2_2_AKE_STORED_KM                 5
-#define HDCP_2_2_AKE_SEND_HPRIME               7
-#define HDCP_2_2_AKE_SEND_PAIRING_INFO         8
-#define HDCP_2_2_LC_INIT                       9
-#define HDCP_2_2_LC_SEND_LPRIME                        10
-#define HDCP_2_2_SKE_SEND_EKS                  11
-#define HDCP_2_2_REP_SEND_RECVID_LIST          12
-#define HDCP_2_2_REP_SEND_ACK                  15
-#define HDCP_2_2_REP_STREAM_MANAGE             16
-#define HDCP_2_2_REP_STREAM_READY              17
-
-#define HDCP_2_2_RTX_LEN                       8
-#define HDCP_2_2_RRX_LEN                       8
-
-#define HDCP_2_2_K_PUB_RX_MOD_N_LEN            128
-#define HDCP_2_2_K_PUB_RX_EXP_E_LEN            3
-#define HDCP_2_2_K_PUB_RX_LEN                  (HDCP_2_2_K_PUB_RX_MOD_N_LEN + \
-                                                HDCP_2_2_K_PUB_RX_EXP_E_LEN)
-
-#define HDCP_2_2_DCP_LLC_SIG_LEN               384
-
-#define HDCP_2_2_E_KPUB_KM_LEN                 128
-#define HDCP_2_2_E_KH_KM_M_LEN                 (16 + 16)
-#define HDCP_2_2_H_PRIME_LEN                   32
-#define HDCP_2_2_E_KH_KM_LEN                   16
-#define HDCP_2_2_RN_LEN                                8
-#define HDCP_2_2_L_PRIME_LEN                   32
-#define HDCP_2_2_E_DKEY_KS_LEN                 16
-#define HDCP_2_2_RIV_LEN                       8
-#define HDCP_2_2_SEQ_NUM_LEN                   3
-#define HDCP_2_2_V_PRIME_HALF_LEN              (HDCP_2_2_L_PRIME_LEN / 2)
-#define HDCP_2_2_RECEIVER_ID_LEN               DRM_HDCP_KSV_LEN
-#define HDCP_2_2_MAX_DEVICE_COUNT              31
-#define HDCP_2_2_RECEIVER_IDS_MAX_LEN          (HDCP_2_2_RECEIVER_ID_LEN * \
-                                                HDCP_2_2_MAX_DEVICE_COUNT)
-#define HDCP_2_2_MPRIME_LEN                    32
-
-/* Following Macros take a byte at a time for bit(s) masking */
-/*
- * TODO: HDCP_2_2_MAX_CONTENT_STREAMS_CNT is based upon actual
- * H/W MST streams capacity.
- * This required to be moved out to platform specific header.
- */
-#define HDCP_2_2_MAX_CONTENT_STREAMS_CNT       4
-#define HDCP_2_2_TXCAP_MASK_LEN                        2
-#define HDCP_2_2_RXCAPS_LEN                    3
-#define HDCP_2_2_RX_REPEATER(x)                        ((x) & BIT(0))
-#define HDCP_2_2_DP_HDCP_CAPABLE(x)            ((x) & BIT(1))
-#define HDCP_2_2_RXINFO_LEN                    2
-
-/* HDCP1.x compliant device in downstream */
-#define HDCP_2_2_HDCP1_DEVICE_CONNECTED(x)     ((x) & BIT(0))
-
-/* HDCP2.0 Compliant repeater in downstream */
-#define HDCP_2_2_HDCP_2_0_REP_CONNECTED(x)     ((x) & BIT(1))
-#define HDCP_2_2_MAX_CASCADE_EXCEEDED(x)       ((x) & BIT(2))
-#define HDCP_2_2_MAX_DEVS_EXCEEDED(x)          ((x) & BIT(3))
-#define HDCP_2_2_DEV_COUNT_LO(x)               (((x) & (0xF << 4)) >> 4)
-#define HDCP_2_2_DEV_COUNT_HI(x)               ((x) & BIT(0))
-#define HDCP_2_2_DEPTH(x)                      (((x) & (0x7 << 1)) >> 1)
-
-struct hdcp2_cert_rx {
-       u8      receiver_id[HDCP_2_2_RECEIVER_ID_LEN];
-       u8      kpub_rx[HDCP_2_2_K_PUB_RX_LEN];
-       u8      reserved[2];
-       u8      dcp_signature[HDCP_2_2_DCP_LLC_SIG_LEN];
-} __packed;
-
-struct hdcp2_streamid_type {
-       u8      stream_id;
-       u8      stream_type;
-} __packed;
-
-/*
- * The TxCaps field specified in the HDCP HDMI, DP specs
- * This field is big endian as specified in the errata.
- */
-struct hdcp2_tx_caps {
-       /* Transmitter must set this to 0x2 */
-       u8      version;
-
-       /* Reserved for HDCP and DP Spec. Read as Zero */
-       u8      tx_cap_mask[HDCP_2_2_TXCAP_MASK_LEN];
-} __packed;
-
-/* Main structures for HDCP2.2 protocol communication */
-struct hdcp2_ake_init {
-       u8                      msg_id;
-       u8                      r_tx[HDCP_2_2_RTX_LEN];
-       struct hdcp2_tx_caps    tx_caps;
-} __packed;
-
-struct hdcp2_ake_send_cert {
-       u8                      msg_id;
-       struct hdcp2_cert_rx    cert_rx;
-       u8                      r_rx[HDCP_2_2_RRX_LEN];
-       u8                      rx_caps[HDCP_2_2_RXCAPS_LEN];
-} __packed;
-
-struct hdcp2_ake_no_stored_km {
-       u8      msg_id;
-       u8      e_kpub_km[HDCP_2_2_E_KPUB_KM_LEN];
-} __packed;
-
-struct hdcp2_ake_stored_km {
-       u8      msg_id;
-       u8      e_kh_km_m[HDCP_2_2_E_KH_KM_M_LEN];
-} __packed;
-
-struct hdcp2_ake_send_hprime {
-       u8      msg_id;
-       u8      h_prime[HDCP_2_2_H_PRIME_LEN];
-} __packed;
-
-struct hdcp2_ake_send_pairing_info {
-       u8      msg_id;
-       u8      e_kh_km[HDCP_2_2_E_KH_KM_LEN];
-} __packed;
-
-struct hdcp2_lc_init {
-       u8      msg_id;
-       u8      r_n[HDCP_2_2_RN_LEN];
-} __packed;
-
-struct hdcp2_lc_send_lprime {
-       u8      msg_id;
-       u8      l_prime[HDCP_2_2_L_PRIME_LEN];
-} __packed;
-
-struct hdcp2_ske_send_eks {
-       u8      msg_id;
-       u8      e_dkey_ks[HDCP_2_2_E_DKEY_KS_LEN];
-       u8      riv[HDCP_2_2_RIV_LEN];
-} __packed;
-
-struct hdcp2_rep_send_receiverid_list {
-       u8      msg_id;
-       u8      rx_info[HDCP_2_2_RXINFO_LEN];
-       u8      seq_num_v[HDCP_2_2_SEQ_NUM_LEN];
-       u8      v_prime[HDCP_2_2_V_PRIME_HALF_LEN];
-       u8      receiver_ids[HDCP_2_2_RECEIVER_IDS_MAX_LEN];
-} __packed;
-
-struct hdcp2_rep_send_ack {
-       u8      msg_id;
-       u8      v[HDCP_2_2_V_PRIME_HALF_LEN];
-} __packed;
-
-struct hdcp2_rep_stream_manage {
-       u8                      msg_id;
-       u8                      seq_num_m[HDCP_2_2_SEQ_NUM_LEN];
-       __be16                  k;
-       struct hdcp2_streamid_type streams[HDCP_2_2_MAX_CONTENT_STREAMS_CNT];
-} __packed;
-
-struct hdcp2_rep_stream_ready {
-       u8      msg_id;
-       u8      m_prime[HDCP_2_2_MPRIME_LEN];
-} __packed;
-
-/* HDCP2.2 TIMEOUTs in mSec */
-#define HDCP_2_2_CERT_TIMEOUT_MS               100
-#define HDCP_2_2_DP_CERT_READ_TIMEOUT_MS       110
-#define HDCP_2_2_HPRIME_NO_PAIRED_TIMEOUT_MS   1000
-#define HDCP_2_2_HPRIME_PAIRED_TIMEOUT_MS      200
-#define HDCP_2_2_DP_HPRIME_READ_TIMEOUT_MS     7
-#define HDCP_2_2_PAIRING_TIMEOUT_MS            200
-#define HDCP_2_2_DP_PAIRING_READ_TIMEOUT_MS    5
-#define        HDCP_2_2_HDMI_LPRIME_TIMEOUT_MS         20
-#define HDCP_2_2_DP_LPRIME_TIMEOUT_MS          16
-#define HDCP_2_2_RECVID_LIST_TIMEOUT_MS                3000
-#define HDCP_2_2_STREAM_READY_TIMEOUT_MS       100
-
-/* HDMI HDCP2.2 Register Offsets */
-#define HDCP_2_2_HDMI_REG_VER_OFFSET           0x50
-#define HDCP_2_2_HDMI_REG_WR_MSG_OFFSET                0x60
-#define HDCP_2_2_HDMI_REG_RXSTATUS_OFFSET      0x70
-#define HDCP_2_2_HDMI_REG_RD_MSG_OFFSET                0x80
-#define HDCP_2_2_HDMI_REG_DBG_OFFSET           0xC0
-
-#define HDCP_2_2_HDMI_SUPPORT_MASK             BIT(2)
-#define HDCP_2_2_RX_CAPS_VERSION_VAL           0x02
-#define HDCP_2_2_SEQ_NUM_MAX                   0xFFFFFF
-#define        HDCP_2_2_DELAY_BEFORE_ENCRYPTION_EN     200
-
-/* Below macros take a byte at a time and mask the bit(s) */
-#define HDCP_2_2_HDMI_RXSTATUS_LEN             2
-#define HDCP_2_2_HDMI_RXSTATUS_MSG_SZ_HI(x)    ((x) & 0x3)
-#define HDCP_2_2_HDMI_RXSTATUS_READY(x)                ((x) & BIT(2))
-#define HDCP_2_2_HDMI_RXSTATUS_REAUTH_REQ(x)   ((x) & BIT(3))
-
-/*
- * Helper functions to convert 24bit big endian hdcp sequence number to
- * host format and back
- */
-static inline
-u32 drm_hdcp_be24_to_cpu(const u8 seq_num[HDCP_2_2_SEQ_NUM_LEN])
-{
-       return (u32)(seq_num[2] | seq_num[1] << 8 | seq_num[0] << 16);
-}
-
-static inline
-void drm_hdcp_cpu_to_be24(u8 seq_num[HDCP_2_2_SEQ_NUM_LEN], u32 val)
-{
-       seq_num[0] = val >> 16;
-       seq_num[1] = val >> 8;
-       seq_num[2] = val;
-}
-
-#define DRM_HDCP_SRM_GEN1_MAX_BYTES            (5 * 1024)
-#define DRM_HDCP_1_4_SRM_ID                    0x8
-#define DRM_HDCP_SRM_ID_MASK                   (0xF << 4)
-#define DRM_HDCP_1_4_VRL_LENGTH_SIZE           3
-#define DRM_HDCP_1_4_DCP_SIG_SIZE              40
-#define DRM_HDCP_2_SRM_ID                      0x9
-#define DRM_HDCP_2_INDICATOR                   0x1
-#define DRM_HDCP_2_INDICATOR_MASK              0xF
-#define DRM_HDCP_2_VRL_LENGTH_SIZE             3
-#define DRM_HDCP_2_DCP_SIG_SIZE                        384
-#define DRM_HDCP_2_NO_OF_DEV_PLUS_RESERVED_SZ  4
-#define DRM_HDCP_2_KSV_COUNT_2_LSBITS(byte)    (((byte) & 0xC0) >> 6)
-
-struct hdcp_srm_header {
-       u8 srm_id;
-       u8 reserved;
-       __be16 srm_version;
-       u8 srm_gen_no;
-} __packed;
-
-struct drm_device;
-struct drm_connector;
-
-int drm_hdcp_check_ksvs_revoked(struct drm_device *dev,
-                               u8 *ksvs, u32 ksv_count);
-int drm_connector_attach_content_protection_property(
-               struct drm_connector *connector, bool hdcp_content_type);
-void drm_hdcp_update_content_protection(struct drm_connector *connector,
-                                       u64 val);
-
-/* Content Type classification for HDCP2.2 vs others */
-#define DRM_MODE_HDCP_CONTENT_TYPE0            0
-#define DRM_MODE_HDCP_CONTENT_TYPE1            1
-
-#endif
index 702f613243bb2e1a43a8f6cfbdbe4a5d7cb0bd05..f441cbcd95a45c2c6d2ab609b7056dfe6fcb3a20 100644 (file)
@@ -11,7 +11,7 @@
 
 #include <linux/mutex.h>
 #include <linux/device.h>
-#include <drm/drm_hdcp.h>
+#include <drm/display/drm_hdcp.h>
 
 /**
  * enum hdcp_port_type - HDCP port implementation type defined by ME FW