[Intel-gfx] [RFC v3] drm/hdcp: drm enum property for CP State

[Sean Paul]

On Mon, Jul 24, 2017 at 2:12 PM, Ramalingam C <ramalingam.c at intel.com> wrote:
> DRM connector property is created to represent the content protection
> state of the connector and to configure the same.
>
> Content protection states defined:
>         DRM_MODE_CONTENT_PROTECTION_UNSUPPORTED         - Unsupported
>         DRM_MODE_CONTENT_PROTECTION_DISABLE             - Disabled
>         DRM_MODE_CONTENT_PROTECTION_ENABLE              - Enabled
>
> v2: Redesigned the property to match with CP needs of CrOS [Sean].
>
> v3: Renamed the state names. Header is removed [sean].
>
> Signed-off-by: Ramalingam C <ramalingam.c at intel.com>
> ---
>  drivers/gpu/drm/drm_connector.c | 14 ++++++++++++++
>  include/drm/drm_mode_config.h   |  5 +++++
>  include/uapi/drm/drm_mode.h     |  5 +++++
>  3 files changed, 24 insertions(+)
>
> diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
> index 5cd61af..d6aaa08 100644
> --- a/drivers/gpu/drm/drm_connector.c
> +++ b/drivers/gpu/drm/drm_connector.c
> @@ -617,6 +617,13 @@ static const struct drm_prop_enum_list drm_link_status_enum_list[] = {
>  };
>  DRM_ENUM_NAME_FN(drm_get_link_status_name, drm_link_status_enum_list)
>
> +static const struct drm_prop_enum_list drm_cp_enum_list[] = {
> +       { DRM_MODE_CONTENT_PROTECTION_UNSUPPORTED,      "Unsupported" },

You're still changing the enum names from the original patch/CrOS
implementation.

https://lists.freedesktop.org/archives/dri-devel/2014-December/073336.html

https://cs.chromium.org/chromium/src/ui/ozone/platform/drm/gpu/drm_display.cc?l=27



> +       { DRM_MODE_CONTENT_PROTECTION_DISABLE,          "Disabled" },
> +       { DRM_MODE_CONTENT_PROTECTION_ENABLE,           "Enabled" },
> +};
> +DRM_ENUM_NAME_FN(drm_get_cp_status_name, drm_cp_enum_list)
> +
>  /**
>   * drm_display_info_set_bus_formats - set the supported bus formats
>   * @info: display info to store bus formats in
> @@ -789,6 +796,13 @@ int drm_connector_create_standard_properties(struct drm_device *dev)
>                 return -ENOMEM;
>         dev->mode_config.link_status_property = prop;
>
> +       prop = drm_property_create_enum(dev, 0, "Content Protection",
> +                                       drm_cp_enum_list,
> +                                       ARRAY_SIZE(drm_cp_enum_list));
> +       if (!prop)
> +               return -ENOMEM;
> +       dev->mode_config.cp_property = prop;
> +
>         return 0;
>  }
>
> diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h
> index 4298171..7acb8b2 100644
> --- a/include/drm/drm_mode_config.h
> +++ b/include/drm/drm_mode_config.h
> @@ -538,6 +538,11 @@ struct drm_mode_config {
>          */
>         struct drm_property *link_status_property;
>         /**
> +        * @cp_property: Default connector property for CP
> +        * of a connector

Can you please elaborate on this, so readers can understand how this
property works? Perhaps just copy the docs from the original patch?

> +        */
> +       struct drm_property *cp_property;
> +       /**
>          * @plane_type_property: Default plane property to differentiate
>          * CURSOR, PRIMARY and OVERLAY legacy uses of planes.
>          */
> diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
> index 403339f..554a770 100644
> --- a/include/uapi/drm/drm_mode.h
> +++ b/include/uapi/drm/drm_mode.h
> @@ -127,6 +127,11 @@ extern "C" {
>  #define DRM_MODE_LINK_STATUS_GOOD      0
>  #define DRM_MODE_LINK_STATUS_BAD       1
>
> +/* Content Protection options */
> +#define DRM_MODE_CONTENT_PROTECTION_UNSUPPORTED                0
> +#define DRM_MODE_CONTENT_PROTECTION_DISABLE            1
> +#define DRM_MODE_CONTENT_PROTECTION_ENABLE             2
> +
>  /*
>   * DRM_MODE_ROTATE_<degrees>
>   *
> --
> 2.7.4
>