Date:   Mon, 14 Nov 2022 16:06:42 +0800
From:   Hsin-Yi Wang <hsinyi@...omium.org>
To:     Robert Foss <robert.foss@...aro.org>,
        Allen Chen <allen.chen@....com.tw>
Cc:     Andrzej Hajda <andrzej.hajda@...el.com>,
        Neil Armstrong <neil.armstrong@...aro.org>,
        Pin-yen Lin <treapking@...omium.org>,
        Laurent Pinchart <Laurent.pinchart@...asonboard.com>,
        AngeloGioacchino Del Regno 
        <angelogioacchino.delregno@...labora.com>,
        Hermes Wu <hermes.wu@....com.tw>,
        Jonas Karlman <jonas@...boo.se>,
        Jernej Skrabec <jernej.skrabec@...il.com>,
        David Airlie <airlied@...il.com>,
        Daniel Vetter <daniel@...ll.ch>,
        dri-devel@...ts.freedesktop.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] drm/bridge: it6505: handle HDCP request

On Tue, Nov 1, 2022 at 7:20 PM Hsin-Yi Wang <hsinyi@...omium.org> wrote:
>
> it6505 supports HDCP 1.3, but current implementation lacks the update of
> HDCP status through drm_hdcp_update_content_protection(). it6505 default
> enables the HDCP. If user set it to undesired then the driver will stop
> HDCP.
>
> Signed-off-by: Hsin-Yi Wang <hsinyi@...omium.org>
> ---
Move this patch into the series to register HDCP property:
https://lore.kernel.org/lkml/20221114080405.2426999-1-hsinyi@chromium.org/

>  drivers/gpu/drm/bridge/ite-it6505.c | 54 +++++++++++++++++++++++++++++
>  1 file changed, 54 insertions(+)
>
> diff --git a/drivers/gpu/drm/bridge/ite-it6505.c b/drivers/gpu/drm/bridge/ite-it6505.c
> index b929fc766e243..65c6f932cae25 100644
> --- a/drivers/gpu/drm/bridge/ite-it6505.c
> +++ b/drivers/gpu/drm/bridge/ite-it6505.c
> @@ -423,6 +423,7 @@ struct it6505 {
>         struct extcon_dev *extcon;
>         struct work_struct extcon_wq;
>         int extcon_state;
> +       struct drm_connector *connector;
>         enum drm_connector_status connector_status;
>         enum link_train_status link_state;
>         struct work_struct link_works;
> @@ -2399,6 +2400,14 @@ static void it6505_irq_hdcp_done(struct it6505 *it6505)
>
>         DRM_DEV_DEBUG_DRIVER(dev, "hdcp done interrupt");
>         it6505->hdcp_status = HDCP_AUTH_DONE;
> +       if (it6505->connector) {
> +               struct drm_device *drm_dev = it6505->connector->dev;
> +
> +               drm_modeset_lock(&drm_dev->mode_config.connection_mutex, NULL);
> +               drm_hdcp_update_content_protection(it6505->connector,
> +                                                  DRM_MODE_CONTENT_PROTECTION_ENABLED);
> +               drm_modeset_unlock(&drm_dev->mode_config.connection_mutex);
> +       }
>         it6505_show_hdcp_info(it6505);
>  }
>
> @@ -2931,6 +2940,7 @@ static void it6505_bridge_atomic_enable(struct drm_bridge *bridge,
>         if (WARN_ON(!connector))
>                 return;
>
> +       it6505->connector = connector;
>         conn_state = drm_atomic_get_new_connector_state(state, connector);
>
>         if (WARN_ON(!conn_state))
> @@ -2974,6 +2984,7 @@ static void it6505_bridge_atomic_disable(struct drm_bridge *bridge,
>
>         DRM_DEV_DEBUG_DRIVER(dev, "start");
>
> +       it6505->connector = NULL;
>         if (it6505->powered) {
>                 it6505_drm_dp_link_set_power(&it6505->aux, &it6505->link,
>                                              DP_SET_POWER_D3);
> @@ -3028,6 +3039,48 @@ static struct edid *it6505_bridge_get_edid(struct drm_bridge *bridge,
>         return edid;
>  }
>
> +static int it6505_connector_atomic_check(struct it6505 *it6505,
> +                                        struct drm_connector_state *state)
> +{
> +       struct device *dev = &it6505->client->dev;
> +       int cp = state->content_protection;
> +
> +       DRM_DEV_DEBUG_DRIVER(dev, "hdcp connector state:%d, curr hdcp state:%d",
> +                            cp, it6505->hdcp_status);
> +
> +       if (!it6505->hdcp_desired) {
> +               DRM_DEV_DEBUG_DRIVER(dev, "sink not support hdcp");
> +               return 0;
> +       }
> +
> +       if (it6505->hdcp_status == HDCP_AUTH_GOING)
> +               return -EINVAL;
> +
> +       if (cp == DRM_MODE_CONTENT_PROTECTION_UNDESIRED) {
> +               if (it6505->hdcp_status == HDCP_AUTH_DONE)
> +                       it6505_stop_hdcp(it6505);
> +       } else if (cp == DRM_MODE_CONTENT_PROTECTION_DESIRED) {
> +               if (it6505->hdcp_status == HDCP_AUTH_IDLE &&
> +                   it6505->link_state == LINK_OK)
> +                       it6505_start_hdcp(it6505);
> +       } else {
> +               DRM_DEV_DEBUG_DRIVER(dev, "invalid to set hdcp enabled");
> +               return -EINVAL;
> +       }
> +
> +       return 0;
> +}
> +
> +static int it6505_bridge_atomic_check(struct drm_bridge *bridge,
> +                                     struct drm_bridge_state *bridge_state,
> +                                     struct drm_crtc_state *crtc_state,
> +                                     struct drm_connector_state *conn_state)
> +{
> +       struct it6505 *it6505 = bridge_to_it6505(bridge);
> +
> +       return it6505_connector_atomic_check(it6505, conn_state);
> +}
> +
>  static const struct drm_bridge_funcs it6505_bridge_funcs = {
>         .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
>         .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
> @@ -3035,6 +3088,7 @@ static const struct drm_bridge_funcs it6505_bridge_funcs = {
>         .attach = it6505_bridge_attach,
>         .detach = it6505_bridge_detach,
>         .mode_valid = it6505_bridge_mode_valid,
> +       .atomic_check = it6505_bridge_atomic_check,
>         .atomic_enable = it6505_bridge_atomic_enable,
>         .atomic_disable = it6505_bridge_atomic_disable,
>         .atomic_pre_enable = it6505_bridge_atomic_pre_enable,
> --
> 2.38.0.135.g90850a2211-goog
>

Powered by blists - more mailing lists