Commit c16fd9be authored by Ramalingam C's avatar Ramalingam C Committed by Daniel Vetter
Browse files

drm/hdcp: gathering hdcp related code into drm_hdcp.c 



Considering the significant size of hdcp related code in drm, all
hdcp related codes are moved into separate file called drm_hdcp.c.

v2:
  Rebased.
v2:
  Rebased.

Signed-off-by: default avatarRamalingam C <ramalingam.c@intel.com>
Suggested-by: default avatarDaniel Vetter <daniel@ffwll.ch>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarDave Airlie <airlied@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190507162745.25600-7-ramalingam.c@intel.com
parent f26ae6a6

drivers/gpu/drm/drm_connector.c

+0 −44
Original line number Diff line number Diff line
@@ -823,13 +823,6 @@ static const struct drm_prop_enum_list drm_tv_subconnector_enum_list[] = { 
DRM_ENUM_NAME_FN(drm_get_tv_subconnector_name,

		 drm_tv_subconnector_enum_list)



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 const struct drm_prop_enum_list hdmi_colorspaces[] = {

	/* For Default case, driver will set the colorspace */

	{ DRM_MODE_COLORIMETRY_DEFAULT, "Default" },
@@ -1515,43 +1508,6 @@ int drm_connector_attach_scaling_mode_property(struct drm_connector *connector, 
}

EXPORT_SYMBOL(drm_connector_attach_scaling_mode_property);



/**

 * drm_connector_attach_content_protection_property - attach content protection

 * property

 *

 * @connector: connector to attach CP property on.

 *

 * 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.

 *

 * The content protection will be set to &drm_connector_state.content_protection

 *

 * Returns:

 * Zero on success, negative errno on failure.

 */

int drm_connector_attach_content_protection_property(

		struct drm_connector *connector)

{

	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;



	return 0;

}

EXPORT_SYMBOL(drm_connector_attach_content_protection_property);



/**

 * drm_mode_create_aspect_ratio_property - create aspect ratio property

 * @dev: DRM device

drivers/gpu/drm/drm_hdcp.c

+47 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 
#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>



struct hdcp_srm {

	u32 revoked_ksv_cnt;
@@ -331,3 +334,47 @@ void drm_teardown_hdcp_srm(struct class *drm_class) 
		kfree(srm_data);

	}

}



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)



/**

 * drm_connector_attach_content_protection_property - attach content protection

 * property

 *

 * @connector: connector to attach CP property on.

 *

 * 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.

 *

 * The content protection will be set to &drm_connector_state.content_protection

 *

 * Returns:

 * Zero on success, negative errno on failure.

 */

int drm_connector_attach_content_protection_property(

		struct drm_connector *connector)

{

	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;



	return 0;

}

EXPORT_SYMBOL(drm_connector_attach_content_protection_property);

include/drm/drm_connector.h

+0 −2
Original line number Diff line number Diff line
@@ -1339,8 +1339,6 @@ int drm_connector_attach_scaling_mode_property(struct drm_connector *connector, 
					       u32 scaling_mode_mask);

int drm_connector_attach_vrr_capable_property(

		struct drm_connector *connector);

int drm_connector_attach_content_protection_property(

		struct drm_connector *connector);

int drm_mode_create_aspect_ratio_property(struct drm_device *dev);

int drm_mode_create_colorspace_property(struct drm_connector *connector);

int drm_mode_create_content_type_property(struct drm_device *dev);

include/drm/drm_hdcp.h

+3 −0
Original line number Diff line number Diff line
@@ -286,7 +286,10 @@ struct hdcp_srm_header { 
} __packed;



struct drm_device;

struct drm_connector;



bool 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);

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE