Re: [PATCH v7 10/10] drm/msm: Implement HDCP 1.x using the new drm HDCP helpers

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, 24 Mar 2023 at 21:21, Mark Yacoub <markyacoub@xxxxxxxxxxxx> wrote:
>
> From: Sean Paul <seanpaul@xxxxxxxxxxxx>
>
> Add HDCP 1.x support to msm DP bridges using the new HDCP
> helpers.
>
> Cc: Stephen Boyd <swboyd@xxxxxxxxxxxx>
> Reviewed-by: Stephen Boyd <swboyd@xxxxxxxxxxxx>
> Signed-off-by: Sean Paul <seanpaul@xxxxxxxxxxxx>
> Signed-off-by: Mark Yacoub <markyacoub@xxxxxxxxxxxx>
>
> ---
>
> Changes in v2:
> -Squash [1] into this patch with the following changes (Stephen)
>   -Update the sc7180 dtsi file
>   -Remove resource names and just use index (Stephen)
> Changes in v3:
> -Split out the dtsi change from v2 (Stephen)
> -Fix set-but-unused warning identified by 0-day
> -Fix up a couple of style nits (Stephen)
> -Store HDCP key directly in dp_hdcp struct (Stephen)
> -Remove wmb in HDCP key initialization, move an_seed (Stephen)
> -Use FIELD_PREP for bstatus/bcaps (Stephen)
> -#define read_poll_timeout values (Stephen)
> -Remove unnecessary parentheses in dp_hdcp_store_ksv_fifo (Stephen)
> -Add compatible string for hdcp (Stephen)
> -Rename dp_hdcp_write_* functions (Abhinav)
> -Add 1us delay between An reads (Abhinav)
> -Delete unused dp_hdcp_read_* functions
> Changes in v4:
> -Rebase on Bjorn's multi-dp patchset
> Changes in v5:
> -Change return check of drm_hdcp_helper_initialize_dp() (Stephen)
> Changes in v6:
> -Change the tracking of the state from connector state to bridge as
> state as drm_connector_state is no longer tracked and the functionality
> has moved to msm_dp_bridge
> Changes in v7:
> -Use dp bridge to maintain the state with no use for connector
>
>  drivers/gpu/drm/msm/Kconfig         |   1 +
>  drivers/gpu/drm/msm/Makefile        |   1 +
>  drivers/gpu/drm/msm/dp/dp_debug.c   |  48 ++-
>  drivers/gpu/drm/msm/dp/dp_debug.h   |  17 +-
>  drivers/gpu/drm/msm/dp/dp_display.c |  42 ++-
>  drivers/gpu/drm/msm/dp/dp_display.h |   5 +
>  drivers/gpu/drm/msm/dp/dp_drm.c     |  39 ++-
>  drivers/gpu/drm/msm/dp/dp_drm.h     |  12 +-
>  drivers/gpu/drm/msm/dp/dp_hdcp.c    | 483 ++++++++++++++++++++++++++++
>  drivers/gpu/drm/msm/dp/dp_hdcp.h    |  31 ++
>  drivers/gpu/drm/msm/dp/dp_parser.c  |  19 ++
>  drivers/gpu/drm/msm/dp/dp_parser.h  |   4 +
>  drivers/gpu/drm/msm/dp/dp_reg.h     |  30 +-
>  drivers/gpu/drm/msm/msm_atomic.c    |  19 ++
>  14 files changed, 732 insertions(+), 19 deletions(-)
>  create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.c
>  create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.h
>
> diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig
> index 86f0e64cbda30..c3e4d6102a5fa 100644
> --- a/drivers/gpu/drm/msm/Kconfig
> +++ b/drivers/gpu/drm/msm/Kconfig
> @@ -15,6 +15,7 @@ config DRM_MSM
>         select REGULATOR
>         select DRM_DP_AUX_BUS
>         select DRM_DISPLAY_DP_HELPER
> +       select DRM_DISPLAY_HDCP_HELPER
>         select DRM_DISPLAY_HELPER
>         select DRM_KMS_HELPER
>         select DRM_PANEL
> diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile
> index 7274c41228ed9..a73e7b858af27 100644
> --- a/drivers/gpu/drm/msm/Makefile
> +++ b/drivers/gpu/drm/msm/Makefile
> @@ -122,6 +122,7 @@ msm-$(CONFIG_DRM_MSM_DP)+= dp/dp_aux.o \
>         dp/dp_ctrl.o \
>         dp/dp_display.o \
>         dp/dp_drm.o \
> +       dp/dp_hdcp.o \
>         dp/dp_hpd.o \
>         dp/dp_link.o \
>         dp/dp_panel.o \
> diff --git a/drivers/gpu/drm/msm/dp/dp_debug.c b/drivers/gpu/drm/msm/dp/dp_debug.c
> index 5e35033ba3e43..e97d27edbb13b 100644
> --- a/drivers/gpu/drm/msm/dp/dp_debug.c
> +++ b/drivers/gpu/drm/msm/dp/dp_debug.c
> @@ -8,6 +8,7 @@
>  #include <linux/debugfs.h>
>  #include <drm/drm_connector.h>
>  #include <drm/drm_file.h>
> +#include <drm/display/drm_hdcp_helper.h>
>
>  #include "dp_parser.h"
>  #include "dp_catalog.h"
> @@ -15,6 +16,7 @@
>  #include "dp_ctrl.h"
>  #include "dp_debug.h"
>  #include "dp_display.h"
> +#include "dp_hdcp.h"
>
>  #define DEBUG_NAME "msm_dp"
>
> @@ -25,6 +27,7 @@ struct dp_debug_private {
>         struct dp_link *link;
>         struct dp_panel *panel;
>         struct drm_connector *connector;
> +       struct dp_hdcp *hdcp;
>         struct device *dev;
>         struct drm_device *drm_dev;
>
> @@ -196,6 +199,35 @@ static int dp_test_active_open(struct inode *inode,
>                         inode->i_private);
>  }
>
> +static ssize_t dp_hdcp_key_write(struct file *file, const char __user *ubuf,
> +                                size_t len, loff_t *offp)
> +{
> +       char *input_buffer;
> +       int ret;
> +       struct dp_debug_private *debug = file->private_data;
> +
> +       if (len != (DRM_HDCP_KSV_LEN + DP_HDCP_NUM_KEYS * DP_HDCP_KEY_LEN))
> +               return -EINVAL;
> +
> +       if (!debug->hdcp)
> +               return -ENOENT;
> +
> +       input_buffer = memdup_user_nul(ubuf, len);
> +       if (IS_ERR(input_buffer))
> +               return PTR_ERR(input_buffer);
> +
> +       ret = dp_hdcp_ingest_key(debug->hdcp, input_buffer, len);
> +
> +       kfree(input_buffer);
> +       if (ret < 0) {
> +               DRM_ERROR("Could not ingest HDCP key, ret=%d\n", ret);
> +               return ret;
> +       }
> +
> +       *offp += len;
> +       return len;
> +}
> +
>  static const struct file_operations test_active_fops = {
>         .owner = THIS_MODULE,
>         .open = dp_test_active_open,
> @@ -205,6 +237,12 @@ static const struct file_operations test_active_fops = {
>         .write = dp_test_active_write
>  };
>
> +static const struct file_operations dp_hdcp_key_fops = {
> +       .owner = THIS_MODULE,
> +       .open = simple_open,
> +       .write = dp_hdcp_key_write,
> +};
> +
>  static void dp_debug_init(struct dp_debug *dp_debug, struct drm_minor *minor)
>  {
>         char path[64];
> @@ -229,11 +267,16 @@ static void dp_debug_init(struct dp_debug *dp_debug, struct drm_minor *minor)
>         debugfs_create_file("msm_dp_test_type", 0444,
>                         debug->root,
>                         debug, &dp_test_type_fops);
> +
> +       debugfs_create_file("msm_dp_hdcp_key", 0222, minor->debugfs_root, debug,
> +                           &dp_hdcp_key_fops);
>  }
>
>  struct dp_debug *dp_debug_get(struct device *dev, struct dp_panel *panel,
> -               struct dp_usbpd *usbpd, struct dp_link *link,
> -               struct drm_connector *connector, struct drm_minor *minor)
> +                             struct dp_usbpd *usbpd, struct dp_link *link,
> +                             struct dp_hdcp *hdcp,
> +                             struct drm_connector *connector,
> +                             struct drm_minor *minor)

Please, do not mix cleanup/reindentation and actual changes. The chunk
above makes it hard to spot the actual difference: addition of struct
dp_hdcp pointer. Please revert _all_ indentation changes (or move them
to a separate cleanup patch).

>  {
>         struct dp_debug_private *debug;
>         struct dp_debug *dp_debug;
> @@ -255,6 +298,7 @@ struct dp_debug *dp_debug_get(struct device *dev, struct dp_panel *panel,
>         debug->usbpd = usbpd;
>         debug->link = link;
>         debug->panel = panel;
> +       debug->hdcp = hdcp;
>         debug->dev = dev;
>         debug->drm_dev = minor->dev;
>         debug->connector = connector;
> diff --git a/drivers/gpu/drm/msm/dp/dp_debug.h b/drivers/gpu/drm/msm/dp/dp_debug.h
> index 8c0d0b5178fdf..61ecea30d065f 100644
> --- a/drivers/gpu/drm/msm/dp/dp_debug.h
> +++ b/drivers/gpu/drm/msm/dp/dp_debug.h
> @@ -6,6 +6,7 @@
>  #ifndef _DP_DEBUG_H_
>  #define _DP_DEBUG_H_
>
> +#include "dp_hdcp.h"
>  #include "dp_panel.h"
>  #include "dp_link.h"
>
> @@ -34,6 +35,7 @@ struct dp_debug {
>   * @panel: instance of panel module
>   * @usbpd: instance of usbpd module
>   * @link: instance of link module
> + * @hdcp: instance of hdcp module
>   * @connector: double pointer to display connector
>   * @minor: pointer to drm minor number after device registration
>   * return: pointer to allocated debug module data
> @@ -42,9 +44,10 @@ struct dp_debug {
>   * for debugfs input to be communicated with existing modules
>   */
>  struct dp_debug *dp_debug_get(struct device *dev, struct dp_panel *panel,
> -               struct dp_usbpd *usbpd, struct dp_link *link,
> -               struct drm_connector *connector,
> -               struct drm_minor *minor);
> +                             struct dp_usbpd *usbpd, struct dp_link *link,
> +                             struct dp_hdcp *hdcp,
> +                             struct drm_connector *connector,
> +                             struct drm_minor *minor);
>
>  /**
>   * dp_debug_put()
> @@ -57,10 +60,10 @@ void dp_debug_put(struct dp_debug *dp_debug);
>
>  #else
>
> -static inline
> -struct dp_debug *dp_debug_get(struct device *dev, struct dp_panel *panel,
> -               struct dp_usbpd *usbpd, struct dp_link *link,
> -               struct drm_connector *connector, struct drm_minor *minor)
> +static inline struct dp_debug *
> +dp_debug_get(struct device *dev, struct dp_panel *panel, struct dp_usbpd *usbpd,
> +            struct dp_link *link, struct dp_hdcp *hdcp,
> +            struct drm_connector *connector, struct drm_minor *minor)
>  {
>         return ERR_PTR(-EINVAL);
>  }
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
> index cbf8fd7a46119..8c099e8a47b73 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.c
> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
> @@ -27,6 +27,7 @@
>  #include "dp_drm.h"
>  #include "dp_audio.h"
>  #include "dp_debug.h"
> +#include "dp_hdcp.h"
>
>  #define HPD_STRING_SIZE 30
>
> @@ -97,6 +98,7 @@ struct dp_display_private {
>         struct dp_panel   *panel;
>         struct dp_ctrl    *ctrl;
>         struct dp_debug   *debug;
> +       struct dp_hdcp *hdcp;
>
>         struct dp_usbpd_cb usbpd_cb;
>         struct dp_display_mode dp_mode;
> @@ -187,6 +189,14 @@ static struct dp_display_private *dev_get_dp_display_private(struct device *dev)
>         return container_of(dp, struct dp_display_private, dp_display);
>  }
>
> +struct dp_hdcp *dp_display_bridge_to_hdcp(struct drm_bridge *bridge)
> +{
> +       struct msm_dp *dp_display = msm_dp_from_bridge(bridge);
> +       struct dp_display_private *dp =
> +               container_of(dp_display, struct dp_display_private, dp_display);
> +       return dp->hdcp;
> +}
> +
>  static int dp_add_event(struct dp_display_private *dp_priv, u32 event,
>                                                 u32 data, u32 delay)
>  {
> @@ -744,6 +754,7 @@ static int dp_irq_hpd_handle(struct dp_display_private *dp, u32 data)
>  static void dp_display_deinit_sub_modules(struct dp_display_private *dp)
>  {
>         dp_debug_put(dp->debug);
> +       dp_hdcp_put(dp->hdcp);
>         dp_audio_put(dp->audio);
>         dp_panel_put(dp->panel);
>         dp_aux_put(dp->aux);
> @@ -844,8 +855,18 @@ static int dp_init_sub_modules(struct dp_display_private *dp)
>         dp->ctrl->wide_bus_en = dp->wide_bus_en;
>         dp->catalog->wide_bus_en = dp->wide_bus_en;
>
> +       dp->hdcp = dp_hdcp_get(dp->parser, dp->aux);
> +       if (IS_ERR(dp->hdcp)) {
> +               rc = PTR_ERR(dp->hdcp);
> +               DRM_ERROR("failed to initialize hdcp, rc = %d\n", rc);
> +               dp->hdcp = NULL;
> +               goto error_hdcp;
> +       }
> +
>         return rc;
>
> +error_hdcp:
> +       dp_audio_put(dp->audio);
>  error_ctrl:
>         dp_panel_put(dp->panel);
>  error_link:
> @@ -957,6 +978,15 @@ int dp_display_set_plugged_cb(struct msm_dp *dp_display,
>         return 0;
>  }
>
> +void dp_display_hdcp_commit(struct msm_dp *dp, struct drm_atomic_state *state)
> +{
> +       struct dp_display_private *dp_display =
> +               container_of(dp, struct dp_display_private, dp_display);
> +
> +       if (dp_display->hdcp)
> +               dp_hdcp_commit(dp_display->hdcp, state);
> +}
> +
>  /**
>   * dp_bridge_mode_valid - callback to determine if specified mode is valid
>   * @bridge: Pointer to drm bridge structure
> @@ -1522,9 +1552,8 @@ void msm_dp_debugfs_init(struct msm_dp *dp_display, struct drm_minor *minor)
>         dp = container_of(dp_display, struct dp_display_private, dp_display);
>         dev = &dp->pdev->dev;
>
> -       dp->debug = dp_debug_get(dev, dp->panel, dp->usbpd,
> -                                       dp->link, dp->dp_display.connector,
> -                                       minor);
> +       dp->debug = dp_debug_get(dev, dp->panel, dp->usbpd, dp->link, dp->hdcp,
> +                                dp->dp_display.connector, minor);
>         if (IS_ERR(dp->debug)) {
>                 rc = PTR_ERR(dp->debug);
>                 DRM_ERROR("failed to initialize debug, rc = %d\n", rc);
> @@ -1644,6 +1673,13 @@ int msm_dp_modeset_init(struct msm_dp *dp_display, struct drm_device *dev,
>
>         dp_priv->panel->connector = dp_display->connector;
>
> +       ret = dp_hdcp_attach(dp_priv->hdcp, dp_display->connector,
> +                            dp_display->bridge);
> +       if (ret) {
> +               DRM_ERROR("Failed to attach hdcp, ret=%d\n", ret);
> +               return ret;
> +       }
> +
>         return 0;
>  }
>
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h
> index dcedf021f7fe1..f4e61273ac7a9 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.h
> +++ b/drivers/gpu/drm/msm/dp/dp_display.h
> @@ -30,8 +30,13 @@ struct msm_dp {
>         struct dp_audio *dp_audio;
>  };
>
> +struct drm_atomic_state;
> +
>  int dp_display_set_plugged_cb(struct msm_dp *dp_display,
>                 hdmi_codec_plugged_cb fn, struct device *codec_dev);
> +struct dp_hdcp *dp_display_bridge_to_hdcp(struct drm_bridge *bridge);
> +void dp_display_hdcp_commit(struct msm_dp *dp_display,
> +                           struct drm_atomic_state *state);
>  int dp_display_get_modes(struct msm_dp *dp_display);
>  int dp_display_request_irq(struct msm_dp *dp_display);
>  bool dp_display_check_video_test(struct msm_dp *dp_display);
> diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c
> index 6db82f9b03afb..f3710a273d76b 100644
> --- a/drivers/gpu/drm/msm/dp/dp_drm.c
> +++ b/drivers/gpu/drm/msm/dp/dp_drm.c
> @@ -7,11 +7,19 @@
>  #include <drm/drm_atomic.h>
>  #include <drm/drm_bridge.h>
>  #include <drm/drm_bridge_connector.h>
> +#include <drm/drm_connector.h>
>  #include <drm/drm_crtc.h>
> +#include <drm/display/drm_hdcp_helper.h>
>
>  #include "msm_drv.h"
>  #include "msm_kms.h"
>  #include "dp_drm.h"
> +#include "dp_hdcp.h"
> +
> +struct msm_dp *msm_dp_from_bridge(struct drm_bridge *bridge)
> +{
> +       return to_dp_bridge(bridge)->dp_display;
> +}
>
>  /**
>   * dp_bridge_detect - callback to determine if connector is connected
> @@ -37,8 +45,8 @@ static int dp_bridge_atomic_check(struct drm_bridge *bridge,
>                             struct drm_connector_state *conn_state)
>  {
>         struct msm_dp *dp;
> -
> -       dp = to_dp_bridge(bridge)->dp_display;
> +       struct msm_dp_bridge *dp_bridge = to_dp_bridge(bridge);
> +       dp = dp_bridge->dp_display;
>
>         drm_dbg_dp(dp->drm_dev, "is_connected = %s\n",
>                 (dp->is_connected) ? "true" : "false");
> @@ -54,8 +62,11 @@ static int dp_bridge_atomic_check(struct drm_bridge *bridge,
>          * disabled by the hardware and thus all access to it should be forbidden.
>          * After that this piece of code can be removed.
>          */
> -       if (bridge->ops & DRM_BRIDGE_OP_HPD)
> -               return (dp->is_connected) ? 0 : -ENOTCONN;
> +       if (bridge->ops & DRM_BRIDGE_OP_HPD && !dp->is_connected)
> +               return -ENOTCONN;
> +
> +       dp_bridge->hdcp_transition =
> +               drm_hdcp_has_changed(conn_state->connector, conn_state->state);
>
>         return 0;
>  }
> @@ -104,6 +115,25 @@ static const struct drm_bridge_funcs dp_bridge_ops = {
>         .atomic_check = dp_bridge_atomic_check,
>  };
>
> +bool dp_drm_is_bridge_msm_dp(struct drm_bridge *bridge)
> +{
> +       return bridge->funcs == &dp_bridge_ops;
> +}
> +
> +void dp_drm_atomic_commit(struct drm_bridge *bridge,
> +                         struct drm_atomic_state *state)
> +{
> +       struct msm_dp_bridge *dp_bridge = to_dp_bridge(bridge);
> +       struct msm_dp *dp_disp;
> +
> +       if (!dp_bridge->hdcp_transition)
> +               return;
> +
> +       dp_disp = msm_dp_from_bridge(bridge);
> +
> +       dp_display_hdcp_commit(dp_disp, state);
> +}
> +
>  struct drm_bridge *dp_bridge_init(struct msm_dp *dp_display, struct drm_device *dev,
>                         struct drm_encoder *encoder)
>  {
> @@ -116,6 +146,7 @@ struct drm_bridge *dp_bridge_init(struct msm_dp *dp_display, struct drm_device *
>                 return ERR_PTR(-ENOMEM);
>
>         dp_bridge->dp_display = dp_display;
> +       dp_bridge->hdcp_transition = false;
>
>         bridge = &dp_bridge->bridge;
>         bridge->funcs = &dp_bridge_ops;
> diff --git a/drivers/gpu/drm/msm/dp/dp_drm.h b/drivers/gpu/drm/msm/dp/dp_drm.h
> index 82035dbb05789..63aff3ed04367 100644
> --- a/drivers/gpu/drm/msm/dp/dp_drm.h
> +++ b/drivers/gpu/drm/msm/dp/dp_drm.h
> @@ -15,13 +15,21 @@
>  struct msm_dp_bridge {
>         struct drm_bridge bridge;
>         struct msm_dp *dp_display;
> +       bool hdcp_transition;
>  };
>
>  #define to_dp_bridge(x)     container_of((x), struct msm_dp_bridge, bridge)
>
> +struct msm_dp *msm_dp_from_bridge(struct drm_bridge *bridge);
> +
>  struct drm_connector *dp_drm_connector_init(struct msm_dp *dp_display, struct drm_encoder *encoder);
> -struct drm_bridge *dp_bridge_init(struct msm_dp *dp_display, struct drm_device *dev,
> -                       struct drm_encoder *encoder);
> +bool dp_drm_is_bridge_msm_dp(struct drm_bridge *bridge);
> +void dp_drm_atomic_commit(struct drm_bridge *bridge,
> +                         struct drm_atomic_state *state);
> +
> +struct drm_bridge *dp_bridge_init(struct msm_dp *dp_display,
> +                                 struct drm_device *dev,
> +                                 struct drm_encoder *encoder);
>
>  void dp_bridge_enable(struct drm_bridge *drm_bridge);
>  void dp_bridge_disable(struct drm_bridge *drm_bridge);
> diff --git a/drivers/gpu/drm/msm/dp/dp_hdcp.c b/drivers/gpu/drm/msm/dp/dp_hdcp.c
> new file mode 100644
> index 0000000000000..303a6dfeec0e8
> --- /dev/null
> +++ b/drivers/gpu/drm/msm/dp/dp_hdcp.c
> @@ -0,0 +1,483 @@
> +// SPDX-License-Identifier: MIT
> +/*
> + * Copyright (C) 2023 Google, Inc.
> + *
> + * Authors:
> + * Sean Paul <seanpaul@xxxxxxxxxxxx>
> + */
> +
> +#include "dp_display.h"
> +#include "dp_drm.h"
> +#include "dp_hdcp.h"
> +#include "dp_reg.h"
> +
> +#include <drm/drm_connector.h>
> +#include <drm/drm_device.h>
> +#include <drm/display/drm_dp_helper.h>
> +#include <drm/display/drm_hdcp_helper.h>
> +#include <drm/drm_print.h>
> +
> +#include <linux/bitfield.h>
> +#include <linux/bits.h>
> +#include <linux/iopoll.h>
> +#include <linux/mutex.h>
> +#include <linux/random.h>
> +#include <linux/slab.h>
> +
> +/* Offsets based on hdcp_ksv mmio */
> +#define DP_HDCP_KSV_AN_LSB 0x0
> +#define DP_HDCP_KSV_AN_MSB 0x4
> +#define DP_HDCP_KSV_AKSV_MSB 0x1D8
> +#define DP_HDCP_KSV_AKSV_LSB 0x1DC

Move them to dp_reg.h?

> +
> +/* Key offsets based on hdcp_key mmio */
> +#define DP_HDCP_KEY_BASE 0x30
> +#define DP_HDCP_KEY_MSB(x) (DP_HDCP_KEY_BASE + (x * 8))
> +#define DP_HDCP_KEY_LSB(x) (DP_HDCP_KEY_MSB(x) + 4)
> +#define DP_HDCP_KEY_VALID 0x170
> +#define DP_HDCP_SW_KEY_VALID BIT(0)
> +
> +/* Timeouts */
> +#define DP_KEYS_VALID_SLEEP_US (20 * 1000)
> +#define DP_KEYS_VALID_TIMEOUT_US (100 * 1000)
> +#define DP_AN_READY_SLEEP_US 100
> +#define DP_AN_READY_TIMEOUT_US (10 * 1000)
> +#define DP_R0_READY_SLEEP_US 100
> +#define DP_R0_READY_TIMEOUT_US (10 * 1000)
> +#define DP_RI_MATCH_SLEEP_US (20 * 1000)
> +#define DP_RI_MATCH_TIMEOUT_US (100 * 1000)
> +#define DP_KSV_WRITTEN_SLEEP_US 100
> +#define DP_KSV_WRITTEN_TIMEOUT_US (100 * 1000)
> +#define DP_SHA_COMPUTATION_SLEEP_US 100
> +#define DP_SHA_COMPUTATION_TIMEOUT_US (100 * 1000)
> +#define DP_AN_READ_DELAY_US 1
> +
> +/*
> + * dp_hdcp_key - structure which contains an HDCP key set
> + * @ksv: The key selection vector
> + * @keys: Contains 40 keys
> + */
> +struct dp_hdcp_key {
> +       struct drm_hdcp_ksv ksv;
> +       union {
> +               u32 words[2];
> +               u8 bytes[DP_HDCP_KEY_LEN];
> +       } keys[DP_HDCP_NUM_KEYS];
> +       bool valid;
> +};
> +
> +struct dp_hdcp {
> +       struct drm_device *dev;
> +       struct drm_connector *connector;
> +
> +       struct drm_dp_aux *aux;
> +       struct dp_parser *parser;
> +
> +       struct drm_hdcp_helper_data *helper_data;
> +
> +       struct mutex key_lock;
> +       struct dp_hdcp_key key;
> +};
> +
> +static inline void dp_hdcp_write_ahb(struct dp_hdcp *hdcp, u32 offset, u32 val)
> +{
> +       writel(val, hdcp->parser->io.dp_controller.ahb.base + offset);
> +}
> +
> +static inline u32 dp_hdcp_read_ahb(struct dp_hdcp *hdcp, u32 offset)
> +{
> +       return readl(hdcp->parser->io.dp_controller.ahb.base + offset);
> +}
> +
> +static inline void dp_hdcp_write_aux(struct dp_hdcp *hdcp, u32 offset, u32 val)
> +{
> +       writel(val, hdcp->parser->io.dp_controller.aux.base + offset);
> +}
> +
> +static inline u32 dp_hdcp_read_aux(struct dp_hdcp *hdcp, u32 offset)
> +{
> +       return readl(hdcp->parser->io.dp_controller.aux.base + offset);
> +}
> +
> +static inline void dp_hdcp_write_link(struct dp_hdcp *hdcp, u32 offset, u32 val)
> +{
> +       writel(val, hdcp->parser->io.dp_controller.link.base + offset);
> +}
> +
> +static inline u32 dp_hdcp_read_link(struct dp_hdcp *hdcp, u32 offset)
> +{
> +       return readl(hdcp->parser->io.dp_controller.link.base + offset);
> +}
> +
> +static inline void dp_hdcp_write_key(struct dp_hdcp *hdcp, u32 offset, u32 val)
> +{
> +       writel(val, hdcp->parser->io.dp_controller.hdcp_key.base + offset);
> +}
> +
> +static inline void dp_hdcp_write_tz_hlos(struct dp_hdcp *hdcp, u32 offset,
> +                                        u32 val)
> +{
> +       writel(val, hdcp->parser->io.dp_controller.hdcp_tz.base + offset);
> +}

Please use existing helpers from dp_catalog.c Add new helpers close to
the existing ones.

> +
> +int dp_hdcp_ingest_key(struct dp_hdcp *hdcp, const u8 *raw_key, int raw_len)
> +{
> +       unsigned int ksv_weight;
> +       int i, ret = 0;
> +
> +       if (raw_len !=
> +           (DRM_HDCP_KSV_LEN + DP_HDCP_NUM_KEYS * DP_HDCP_KEY_LEN)) {

You can calculate the len and assign it to the temp variable. Helps
with both indentation and duplication.

> +               DRM_ERROR(
> +                       "Invalid HDCP key length expected=%d actual=%d\n",
> +                       (DRM_HDCP_KSV_LEN + DP_HDCP_NUM_KEYS * DP_HDCP_KEY_LEN),
> +                       raw_len);
> +               return -EINVAL;
> +       }
> +
> +       mutex_lock(&hdcp->key_lock);
> +
> +       memcpy(hdcp->key.ksv.bytes, raw_key, DRM_HDCP_KSV_LEN);
> +       ksv_weight = hweight32(hdcp->key.ksv.words[0]) +
> +                    hweight32(hdcp->key.ksv.words[1]);
> +       if (ksv_weight != 20) {
> +               DRM_ERROR("Invalid ksv weight, expected=20 actual=%d\n",
> +                         ksv_weight);
> +               ret = -EINVAL;
> +               goto out;
> +       }
> +
> +       raw_key += DRM_HDCP_KSV_LEN;
> +       for (i = 0; i < DP_HDCP_NUM_KEYS; i++) {
> +               memcpy(hdcp->key.keys[i].bytes, raw_key, DP_HDCP_KEY_LEN);
> +               raw_key += DP_HDCP_KEY_LEN;
> +       }
> +
> +       DRM_DEBUG_DRIVER("Successfully ingested HDCP key\n");
> +       hdcp->key.valid = true;
> +
> +out:
> +       mutex_unlock(&hdcp->key_lock);
> +       return ret;
> +}
> +
> +static bool dp_hdcp_are_keys_valid(struct drm_connector *connector,
> +                                  void *driver_data)
> +{
> +       struct drm_bridge *bridge = (struct drm_bridge *)driver_data;
> +       struct dp_hdcp *hdcp = dp_display_bridge_to_hdcp(bridge);
> +       u32 val;
> +
> +       val = dp_hdcp_read_ahb(hdcp, DP_HDCP_STATUS);
> +       return FIELD_GET(DP_HDCP_KEY_STATUS, val) == DP_HDCP_KEY_STATUS_VALID;
> +}
> +
> +static int dp_hdcp_load_keys(struct drm_connector *connector, void *driver_data)
> +{
> +       struct drm_bridge *bridge = (struct drm_bridge *)driver_data;
> +       struct dp_hdcp *hdcp = dp_display_bridge_to_hdcp(bridge);
> +       int i, ret = 0;
> +       u64 an_seed = get_random_u64();
> +
> +       mutex_lock(&hdcp->key_lock);
> +
> +       if (!hdcp->key.valid) {
> +               ret = -ENOENT;
> +               goto out;
> +       }
> +
> +       dp_hdcp_write_aux(hdcp, DP_HDCP_SW_LOWER_AKSV, hdcp->key.ksv.words[0]);
> +       dp_hdcp_write_aux(hdcp, DP_HDCP_SW_UPPER_AKSV, hdcp->key.ksv.words[1]);
> +
> +       for (i = 0; i < DP_HDCP_NUM_KEYS; i++) {
> +               dp_hdcp_write_key(hdcp, DP_HDCP_KEY_LSB(i),
> +                                 hdcp->key.keys[i].words[0]);
> +               dp_hdcp_write_key(hdcp, DP_HDCP_KEY_MSB(i),
> +                                 hdcp->key.keys[i].words[1]);
> +       }
> +
> +       dp_hdcp_write_key(hdcp, DP_HDCP_KEY_VALID, DP_HDCP_SW_KEY_VALID);
> +
> +       dp_hdcp_write_link(hdcp, DP_HDCP_ENTROPY_CTRL0,
> +                          FIELD_GET(GENMASK(31, 0), an_seed));
> +       dp_hdcp_write_link(hdcp, DP_HDCP_ENTROPY_CTRL1,
> +                          FIELD_GET(GENMASK_ULL(63, 32), an_seed));
> +
> +out:
> +       mutex_unlock(&hdcp->key_lock);
> +       return ret;
> +}
> +
> +static int dp_hdcp_hdcp2_capable(struct drm_connector *connector, bool *capable,
> +                                void *driver_data)
> +{
> +       *capable = false;
> +       return 0;
> +}
> +
> +static int dp_hdcp_hdcp1_read_an_aksv(struct drm_connector *connector, u32 *an,
> +                                     u32 *aksv, void *driver_data)
> +{
> +       struct drm_bridge *bridge = (struct drm_bridge *)driver_data;
> +       struct dp_hdcp *hdcp = dp_display_bridge_to_hdcp(bridge);
> +       bool keys_valid;
> +       int ret;
> +       u32 val;
> +
> +       dp_hdcp_write_ahb(hdcp, DP_HDCP_CTRL, 1);
> +
> +       ret = read_poll_timeout(dp_hdcp_are_keys_valid, keys_valid, keys_valid,
> +                               DP_KEYS_VALID_SLEEP_US,
> +                               DP_KEYS_VALID_TIMEOUT_US, false, connector,
> +                               driver_data);
> +       if (ret) {
> +               drm_err(hdcp->dev, "HDCP keys invalid %d\n", ret);
> +               return ret;
> +       }
> +
> +       /* Clear AInfo */
> +       dp_hdcp_write_aux(hdcp, DP_HDCP_RCVPORT_DATA4, 0);
> +
> +       aksv[0] = dp_hdcp_read_aux(hdcp, DP_HDCP_RCVPORT_DATA3);
> +       aksv[1] = GENMASK(7, 0) & dp_hdcp_read_aux(hdcp, DP_HDCP_RCVPORT_DATA4);
> +
> +       ret = read_poll_timeout(dp_hdcp_read_ahb, val,
> +                               (val & DP_HDCP_AN_READY_MASK) ==
> +                                       DP_HDCP_AN_READY_MASK,
> +                               DP_AN_READY_SLEEP_US, DP_AN_READY_TIMEOUT_US,
> +                               false, hdcp, DP_HDCP_STATUS);
> +       if (ret) {
> +               drm_err(hdcp->dev, "AN failed to become ready %x/%d\n", val,
> +                       ret);
> +               return ret;
> +       }
> +
> +       /*
> +        * Get An from hardware, for unknown reasons we need to read the reg
> +        * twice to get valid data.
> +        */
> +       dp_hdcp_read_ahb(hdcp, DP_HDCP_RCVPORT_DATA5);
> +       an[0] = dp_hdcp_read_ahb(hdcp, DP_HDCP_RCVPORT_DATA5);
> +
> +       udelay(DP_AN_READ_DELAY_US);
> +
> +       dp_hdcp_read_ahb(hdcp, DP_HDCP_RCVPORT_DATA6);
> +       an[1] = dp_hdcp_read_ahb(hdcp, DP_HDCP_RCVPORT_DATA6);
> +
> +       return 0;
> +}
> +
> +static int dp_hdcp_hdcp1_store_receiver_info(struct drm_connector *connector,
> +                                            u32 *ksv, u32 status, u8 bcaps,
> +                                            bool is_repeater,
> +                                            void *driver_data)
> +{
> +       struct drm_bridge *bridge = (struct drm_bridge *)driver_data;
> +       struct dp_hdcp *hdcp = dp_display_bridge_to_hdcp(bridge);
> +       u32 val;
> +
> +       dp_hdcp_write_tz_hlos(hdcp, HDCP_SEC_DP_TZ_HV_HLOS_HDCP_RCVPORT_DATA0,
> +                             ksv[0]);
> +       dp_hdcp_write_tz_hlos(hdcp, HDCP_SEC_DP_TZ_HV_HLOS_HDCP_RCVPORT_DATA1,
> +                             ksv[1]);
> +
> +       val = FIELD_PREP(GENMASK(23, 8), status) |
> +             FIELD_PREP(GENMASK(7, 0), bcaps);
> +
> +       dp_hdcp_write_tz_hlos(hdcp, HDCP_SEC_DP_TZ_HV_HLOS_HDCP_RCVPORT_DATA12,
> +                             val);
> +
> +       return 0;
> +}
> +
> +static int dp_hdcp_hdcp1_enable_encryption(struct drm_connector *connector,
> +                                          void *driver_data)
> +{
> +       return 0;
> +}

This raises a lot of questions. Please add the comment why this
function is empty

> +
> +static int dp_hdcp_hdcp1_wait_for_r0(struct drm_connector *connector,
> +                                    void *driver_data)
> +{
> +       struct drm_bridge *bridge = (struct drm_bridge *)driver_data;
> +       struct dp_hdcp *hdcp = dp_display_bridge_to_hdcp(bridge);
> +       int ret;
> +       u32 val;
> +
> +       ret = read_poll_timeout(dp_hdcp_read_ahb, val, (val & DP_HDCP_R0_READY),
> +                               DP_R0_READY_SLEEP_US, DP_R0_READY_TIMEOUT_US,
> +                               false, hdcp, DP_HDCP_STATUS);
> +       if (ret) {
> +               drm_err(hdcp->dev, "HDCP R0 not ready %x/%d\n", val, ret);
> +               return ret;
> +       }
> +
> +       return 0;
> +}
> +
> +static int dp_hdcp_hdcp1_match_ri(struct drm_connector *connector, u32 ri_prime,
> +                                 void *driver_data)
> +{
> +       struct drm_bridge *bridge = (struct drm_bridge *)driver_data;
> +       struct dp_hdcp *hdcp = dp_display_bridge_to_hdcp(bridge);
> +       int ret;
> +       u32 val;
> +
> +       dp_hdcp_write_ahb(hdcp, DP_HDCP_RCVPORT_DATA2_0, ri_prime);
> +
> +       ret = read_poll_timeout(dp_hdcp_read_ahb, val, (val & DP_HDCP_RI_MATCH),
> +                               DP_RI_MATCH_SLEEP_US, DP_RI_MATCH_TIMEOUT_US,
> +                               false, hdcp, DP_HDCP_STATUS);
> +       if (ret) {
> +               drm_err(hdcp->dev,
> +                       "Failed to match Ri and Ri` (%08x) %08x/%d\n", ri_prime,
> +                       val, ret);
> +               return ret;
> +       }
> +       return 0;
> +}
> +
> +static int dp_hdcp_hdcp1_store_ksv_fifo(struct drm_connector *connector,
> +                                       u8 *ksv_fifo, u8 num_downstream,
> +                                       u8 *bstatus, u32 *vprime,
> +                                       void *driver_data)
> +{
> +       struct drm_bridge *bridge = (struct drm_bridge *)driver_data;
> +       struct dp_hdcp *hdcp = dp_display_bridge_to_hdcp(bridge);
> +       int num_bytes = num_downstream * DRM_HDCP_KSV_LEN;
> +       int ret, i;
> +       u32 val;
> +
> +       /* Reset the SHA computation block */
> +       dp_hdcp_write_tz_hlos(hdcp, HDCP_SEC_DP_TZ_HV_HLOS_HDCP_SHA_CTRL,
> +                             DP_HDCP_SHA_CTRL_RESET);
> +       dp_hdcp_write_tz_hlos(hdcp, HDCP_SEC_DP_TZ_HV_HLOS_HDCP_SHA_CTRL, 0);
> +
> +       /*
> +        * KSV info gets written a byte at a time in the same order it was
> +        * received. Every 64 bytes, we need to wait for the SHA_BLOCK_DONE
> +        * bit to be set in SHA_CTRL.
> +        */
> +       for (i = 0; i < num_bytes; i++) {
> +               val = FIELD_PREP(DP_HDCP_SHA_DATA_MASK, ksv_fifo[i]);
> +
> +               if (i == (num_bytes - 1))
> +                       val |= DP_HDCP_SHA_DATA_DONE;
> +
> +               dp_hdcp_write_tz_hlos(
> +                       hdcp, HDCP_SEC_DP_TZ_HV_HLOS_HDCP_SHA_DATA, val);
> +
> +               if (((i + 1) % 64) != 0)

Please remove unused parentheses.

> +                       continue;
> +
> +               ret = read_poll_timeout(dp_hdcp_read_ahb, val,
> +                                       (val & DP_HDCP_SHA_DONE),
> +                                       DP_KSV_WRITTEN_SLEEP_US,
> +                                       DP_KSV_WRITTEN_TIMEOUT_US, false, hdcp,
> +                                       DP_HDCP_SHA_STATUS);
> +               if (ret) {
> +                       drm_err(hdcp->dev, "SHA block incomplete %d\n", ret);
> +                       return ret;
> +               }
> +       }
> +
> +       ret = read_poll_timeout(dp_hdcp_read_ahb, val,
> +                               (val & DP_HDCP_SHA_COMP_DONE),
> +                               DP_SHA_COMPUTATION_SLEEP_US,
> +                               DP_SHA_COMPUTATION_TIMEOUT_US, false, hdcp,
> +                               DP_HDCP_SHA_STATUS);
> +       if (ret) {
> +               drm_err(hdcp->dev, "SHA computation incomplete %d\n", ret);
> +               return ret;
> +       }
> +
> +       return 0;
> +}
> +
> +static int dp_hdcp_hdcp1_disable(struct drm_connector *connector,
> +                                void *driver_data)
> +{
> +       struct drm_bridge *bridge = (struct drm_bridge *)driver_data;
> +       struct dp_hdcp *hdcp = dp_display_bridge_to_hdcp(bridge);
> +       u32 val;
> +
> +       val = dp_hdcp_read_ahb(hdcp, REG_DP_SW_RESET);
> +       dp_hdcp_write_ahb(hdcp, REG_DP_SW_RESET, val | DP_HDCP_SW_RESET);
> +
> +       /* Disable encryption and disable the HDCP block */
> +       dp_hdcp_write_ahb(hdcp, DP_HDCP_CTRL, 0);
> +
> +       dp_hdcp_write_ahb(hdcp, REG_DP_SW_RESET, val);
> +
> +       return 0;
> +}
> +
> +void dp_hdcp_commit(struct dp_hdcp *hdcp, struct drm_atomic_state *state)
> +{
> +       drm_hdcp_helper_atomic_commit(hdcp->helper_data, state, NULL);
> +}
> +
> +static const struct drm_hdcp_helper_funcs dp_hdcp_funcs = {
> +       .are_keys_valid = dp_hdcp_are_keys_valid,
> +       .load_keys = dp_hdcp_load_keys,
> +       .hdcp2_capable = dp_hdcp_hdcp2_capable,
> +       .hdcp1_read_an_aksv = dp_hdcp_hdcp1_read_an_aksv,
> +       .hdcp1_store_receiver_info = dp_hdcp_hdcp1_store_receiver_info,
> +       .hdcp1_enable_encryption = dp_hdcp_hdcp1_enable_encryption,
> +       .hdcp1_wait_for_r0 = dp_hdcp_hdcp1_wait_for_r0,
> +       .hdcp1_match_ri = dp_hdcp_hdcp1_match_ri,
> +       .hdcp1_store_ksv_fifo = dp_hdcp_hdcp1_store_ksv_fifo,
> +       .hdcp1_disable = dp_hdcp_hdcp1_disable,
> +       /* Common DRM functions that are different between DP vs HDMI*/
> +       .remote_read = drm_hdcp_remote_dpcd_read,
> +       .remote_write = drm_hdcp_remote_dpcd_write,
> +       .hdcp1_capable = drm_hdcp_helper_hdcp1_capable_dp,
> +       .hdcp1_ksv_fifo_ready = drm_hdcp_helper_hdcp1_ksv_fifo_ready_dp,
> +       .wait_r0 = drm_hdcp_helper_wait_r0_dp,
> +       .hdcp1_check_link_registers = drm_hdcp_hdcp1_check_link_registers_dp,
> +       .hdcp1_read_ksv_fifo = drm_hdcp_helper_hdcp1_read_ksv_fifo_dp
> +};
> +
> +int dp_hdcp_attach(struct dp_hdcp *hdcp, struct drm_connector *connector,
> +                  struct drm_bridge *bridge)
> +{
> +       struct drm_hdcp_helper_data *helper_data;
> +
> +       /* HDCP is not configured for this device */
> +       if (!hdcp->parser->io.dp_controller.hdcp_key.base)
> +               return 0;
> +
> +       helper_data = drm_hdcp_helper_initialize_dp(connector, hdcp->aux,
> +                                                   &dp_hdcp_funcs, false);
> +       if (IS_ERR(helper_data))
> +               return PTR_ERR(helper_data);
> +
> +       helper_data->driver_data = bridge;
> +       hdcp->dev = connector->dev;
> +       hdcp->connector = connector;
> +       hdcp->helper_data = helper_data;
> +
> +       return 0;
> +}
> +
> +struct dp_hdcp *dp_hdcp_get(struct dp_parser *parser, struct drm_dp_aux *aux)
> +{
> +       struct device *dev = &parser->pdev->dev;
> +       struct dp_hdcp *hdcp;
> +
> +       hdcp = devm_kzalloc(dev, sizeof(*hdcp), GFP_KERNEL);
> +       if (!hdcp)
> +               return ERR_PTR(-ENOMEM);
> +
> +       hdcp->parser = parser;
> +       hdcp->aux = aux;
> +
> +       mutex_init(&hdcp->key_lock);
> +
> +       return hdcp;
> +}
> +
> +void dp_hdcp_put(struct dp_hdcp *hdcp)
> +{
> +       if (hdcp)
> +               drm_hdcp_helper_destroy(hdcp->helper_data);
> +}
> \ No newline at end of file

This should be fixed

> diff --git a/drivers/gpu/drm/msm/dp/dp_hdcp.h b/drivers/gpu/drm/msm/dp/dp_hdcp.h
> new file mode 100644
> index 0000000000000..f6e3cb87b7055
> --- /dev/null
> +++ b/drivers/gpu/drm/msm/dp/dp_hdcp.h
> @@ -0,0 +1,31 @@
> +// SPDX-License-Identifier: MIT
> +/*
> + * Copyright (C) 2021 Google, Inc.
> + *
> + * Authors:
> + * Sean Paul <seanpaul@xxxxxxxxxxxx>
> + */
> +
> +#ifndef DP_HDCP_H_
> +#define DP_HDCP_H_
> +
> +#include <drm/display/drm_hdcp_helper.h>
> +#include <drm/drm_bridge.h>
> +
> +#define DP_HDCP_KEY_LEN 7
> +#define DP_HDCP_NUM_KEYS 40
> +
> +struct dp_hdcp;
> +struct dp_parser;
> +struct drm_atomic_state;
> +struct drm_dp_aux;
> +
> +struct dp_hdcp *dp_hdcp_get(struct dp_parser *parser, struct drm_dp_aux *aux);
> +void dp_hdcp_put(struct dp_hdcp *hdcp);
> +
> +int dp_hdcp_attach(struct dp_hdcp *hdcp, struct drm_connector *connector,
> +                  struct drm_bridge *bridge);
> +int dp_hdcp_ingest_key(struct dp_hdcp *hdcp, const u8 *raw_key, int raw_len);
> +void dp_hdcp_commit(struct dp_hdcp *hdcp, struct drm_atomic_state *state);
> +
> +#endif // DRIVERS_GPU_DRM_MSM_DP_DP_HDCP_H_

no, the guard name differs

> \ No newline at end of file

This should be fixed

> diff --git a/drivers/gpu/drm/msm/dp/dp_parser.c b/drivers/gpu/drm/msm/dp/dp_parser.c
> index 7032dcc8842b3..12650b599141f 100644
> --- a/drivers/gpu/drm/msm/dp/dp_parser.c
> +++ b/drivers/gpu/drm/msm/dp/dp_parser.c
> @@ -66,6 +66,10 @@ static int dp_parser_ctrl_res(struct dp_parser *parser)
>                         dss->link.len = DP_DEFAULT_LINK_SIZE;
>                         dss->p0.base = dss->ahb.base + DP_DEFAULT_P0_OFFSET;
>                         dss->p0.len = DP_DEFAULT_P0_SIZE;
> +                       dss->hdcp_key.base = NULL;
> +                       dss->hdcp_key.len = 0;
> +                       dss->hdcp_tz.base = NULL;
> +                       dss->hdcp_tz.len = 0;

Is there a need to initialize to default values?

>                 } else {
>                         DRM_ERROR("unable to remap aux region: %pe\n", dss->aux.base);
>                         return PTR_ERR(dss->aux.base);
> @@ -84,6 +88,21 @@ static int dp_parser_ctrl_res(struct dp_parser *parser)
>                 }
>         }
>
> +       dss->hdcp_key.base = dp_ioremap(pdev, 5, &dss->hdcp_key.len);

You can use the temp variable here. It will allow you to drop the
whole else chunk

> +       if (!IS_ERR(dss->hdcp_key.base)) {
> +               dss->hdcp_tz.base = dp_ioremap(pdev, 6, &dss->hdcp_tz.len);
> +               if (IS_ERR(dss->hdcp_tz.base)) {
> +                       DRM_ERROR("unable to remap hdcp_tz region: %pe\n",
> +                                 dss->hdcp_tz.base);
> +                       return PTR_ERR(dss->hdcp_tz.base);
> +               }
> +       } else {
> +               dss->hdcp_key.base = NULL;
> +               dss->hdcp_key.len = 0;
> +               dss->hdcp_tz.base = NULL;
> +               dss->hdcp_tz.len = 0;
> +       }
> +
>         io->phy = devm_phy_get(&pdev->dev, "dp");
>         if (IS_ERR(io->phy))
>                 return PTR_ERR(io->phy);
> diff --git a/drivers/gpu/drm/msm/dp/dp_parser.h b/drivers/gpu/drm/msm/dp/dp_parser.h
> index 1f068626d445e..8b5dd3deb85ff 100644
> --- a/drivers/gpu/drm/msm/dp/dp_parser.h
> +++ b/drivers/gpu/drm/msm/dp/dp_parser.h
> @@ -35,6 +35,8 @@ struct dss_io_data {
>         struct dss_io_region aux;
>         struct dss_io_region link;
>         struct dss_io_region p0;
> +       struct dss_io_region hdcp_key;
> +       struct dss_io_region hdcp_tz;
>  };
>
>  static inline const char *dp_parser_pm_name(enum dp_pm_type module)
> @@ -69,6 +71,8 @@ struct dp_display_data {
>   * struct dp_ctrl_resource - controller's IO related data
>   *
>   * @dp_controller: Display Port controller mapped memory address
> + * @hdcp_key: mapped memory for HDCP key ingestion
> + * @hdcp_tz: mapped memory for HDCP TZ interaction
>   * @phy_io: phy's mapped memory address
>   */
>  struct dp_io {
> diff --git a/drivers/gpu/drm/msm/dp/dp_reg.h b/drivers/gpu/drm/msm/dp/dp_reg.h
> index 268602803d9a3..d2ac60ce7ae50 100644
> --- a/drivers/gpu/drm/msm/dp/dp_reg.h
> +++ b/drivers/gpu/drm/msm/dp/dp_reg.h
> @@ -10,7 +10,8 @@
>  #define REG_DP_HW_VERSION                      (0x00000000)
>
>  #define REG_DP_SW_RESET                                (0x00000010)
> -#define DP_SW_RESET                            (0x00000001)
> +#define DP_SW_RESET                            BIT(0)
> +#define DP_HDCP_SW_RESET                       BIT(1)
>
>  #define REG_DP_PHY_CTRL                                (0x00000014)
>  #define DP_PHY_CTRL_SW_RESET_PLL               (0x00000001)
> @@ -283,19 +284,46 @@
>  /* DP HDCP 1.3 registers */
>  #define DP_HDCP_CTRL                                   (0x0A0)
>  #define DP_HDCP_STATUS                                 (0x0A4)
> +#define DP_HDCP_KEY_STATUS                                                GENMASK(18, 16)
> +#define DP_HDCP_KEY_STATUS_NO_KEYS                                        0
> +#define DP_HDCP_KEY_STATUS_NOT_CHECKED                                    1
> +#define DP_HDCP_KEY_STATUS_CHECKING                               2
> +#define DP_HDCP_KEY_STATUS_VALID                                          3
> +#define DP_HDCP_KEY_STATUS_INVALID_AKSV                           4
> +#define DP_HDCP_KEY_STATUS_BAD_CHECKSUM                           5
> +#define DP_HDCP_KEY_STATUS_PROD_AKSV                              6
> +#define DP_HDCP_KEY_STATUS_RESV                                           7
> +#define DP_HDCP_R0_READY                                                          BIT(14)
> +#define DP_HDCP_SHA_V_MATCH                                               BIT(13)
> +#define DP_HDCP_RI_MATCH                                                          BIT(12)
> +#define DP_HDCP_AN_MSB_READY                                              BIT(9)
> +#define DP_HDCP_AN_LSB_READY                                              BIT(8)
> +#define DP_HDCP_AN_READY_MASK                                             (DP_HDCP_AN_MSB_READY | DP_HDCP_AN_LSB_READY)
> +#define DP_HDCP_AUTH_FAIL_INFO                                                    GENMASK(7, 4)
> +#define DP_HDCP_AUTH_FAIL_INVALID_AKSV                                    3
> +#define DP_HDCP_AUTH_FAIL_INVALID_BKSV                                    4
> +#define DP_HDCP_AUTH_FAIL_RI_MISMATCH                             5
> +#define DP_HDCP_AUTH_FAIL                                                         BIT(2)
> +#define DP_HDCP_AUTH_SUCCESS                                              BIT(0)
>  #define DP_HDCP_SW_UPPER_AKSV                          (0x098)
>  #define DP_HDCP_SW_LOWER_AKSV                          (0x09C)
>  #define DP_HDCP_ENTROPY_CTRL0                          (0x350)
>  #define DP_HDCP_ENTROPY_CTRL1                          (0x35C)
>  #define DP_HDCP_SHA_STATUS                             (0x0C8)
> +#define DP_HDCP_SHA_COMP_DONE                                             BIT(4)
> +#define DP_HDCP_SHA_DONE                                                          BIT(0)
>  #define DP_HDCP_RCVPORT_DATA2_0                        (0x0B0)
>  #define DP_HDCP_RCVPORT_DATA3                          (0x0A4)
>  #define DP_HDCP_RCVPORT_DATA4                          (0x0A8)
>  #define DP_HDCP_RCVPORT_DATA5                          (0x0C0)
>  #define DP_HDCP_RCVPORT_DATA6                          (0x0C4)
> +#define DP_HDCP_RCVPORT_DATA7                                             (0x0C8)
>
>  #define HDCP_SEC_DP_TZ_HV_HLOS_HDCP_SHA_CTRL           (0x024)
> +#define DP_HDCP_SHA_CTRL_RESET                                                    BIT(0)
>  #define HDCP_SEC_DP_TZ_HV_HLOS_HDCP_SHA_DATA           (0x028)
> +#define DP_HDCP_SHA_DATA_MASK                                             GENMASK(23, 16)
> +#define DP_HDCP_SHA_DATA_DONE                                             BIT(0)
>  #define HDCP_SEC_DP_TZ_HV_HLOS_HDCP_RCVPORT_DATA0      (0x004)
>  #define HDCP_SEC_DP_TZ_HV_HLOS_HDCP_RCVPORT_DATA1      (0x008)
>  #define HDCP_SEC_DP_TZ_HV_HLOS_HDCP_RCVPORT_DATA7      (0x00C)
> diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c
> index 1686fbb611fd7..82cfbfbae83e7 100644
> --- a/drivers/gpu/drm/msm/msm_atomic.c
> +++ b/drivers/gpu/drm/msm/msm_atomic.c
> @@ -4,9 +4,12 @@
>   * Author: Rob Clark <robdclark@xxxxxxxxx>
>   */
>
> +#include "drm/drm_bridge.h"
> +#include "drm/drm_device.h"

Wrong quotes. Also please use some sorting order: either add new
includes to the end, or use the alphabetic sort.

>  #include <drm/drm_atomic_uapi.h>
>  #include <drm/drm_vblank.h>
>
> +#include "dp/dp_drm.h"
>  #include "msm_atomic_trace.h"
>  #include "msm_drv.h"
>  #include "msm_gem.h"
> @@ -179,6 +182,20 @@ static unsigned get_crtc_mask(struct drm_atomic_state *state)
>         return mask;
>  }
>
> +static void msm_atomic_commit_connectors(struct drm_atomic_state *state)
> +{
> +       struct drm_device *dev = state->dev;
> +       struct msm_drm_private *priv = dev->dev_private;
> +       int i;
> +
> +       for (i = 0; i < priv->num_bridges; ++i) {
> +               struct drm_bridge *bridge = priv->bridges[i];
> +               if (dp_drm_is_bridge_msm_dp(bridge)) {
> +                       dp_drm_atomic_commit(bridge, state);
> +               }

No. First, this relies on the fact that only DP bridges need
additional handling here. Second, there might be other parties
involved in the HDCP setup. Think about DSI-to-HDMI or -to-DP bridges.
Or about the HDCP being optionally supported for eDP.

Is there any reason why we can handle HDCP from bridge's
atomic_enable() callback?


> +       }
> +}
> +
>  void msm_atomic_commit_tail(struct drm_atomic_state *state)
>  {
>         struct drm_device *dev = state->dev;
> @@ -215,6 +232,8 @@ void msm_atomic_commit_tail(struct drm_atomic_state *state)
>         drm_atomic_helper_commit_planes(dev, state, 0);
>         drm_atomic_helper_commit_modeset_enables(dev, state);
>
> +       msm_atomic_commit_connectors(state);
> +
>         if (async) {
>                 struct msm_pending_timer *timer =
>                         &kms->pending_timers[drm_crtc_index(async_crtc)];
> --
> 2.40.0.348.gf938b09366-goog
>


--
With best wishes
Dmitry



[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [Linux for Sparc]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]

  Powered by Linux