[PATCH 1/3] drm/connector: Create a helper to attach the hdr_output_metadata property

[Jernej Škrabec]

Hi!

Dne petek, 19. marec 2021 ob 13:49:20 CET je Maxime Ripard napisal(a):
> All the drivers that implement HDR output call pretty much the same
> function to initialise the hdr_output_metadata property, and while the
> creation of that property is in a helper, every driver uses the same
> code to attach it.
> 
> Provide a helper for it as well
> 
> Signed-off-by: Maxime Ripard <maxime at cerno.tech>
> ---
>  .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c |  4 +---
>  drivers/gpu/drm/bridge/synopsys/dw-hdmi.c     |  3 +--
>  drivers/gpu/drm/drm_connector.c               | 21 +++++++++++++++++++
>  drivers/gpu/drm/i915/display/intel_hdmi.c     |  3 +--
>  include/drm/drm_connector.h                   |  1 +
>  5 files changed, 25 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index
> 22124f76d0b5..06908a3cee0f 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -7017,9 +7017,7 @@ void amdgpu_dm_connector_init_helper(struct
> amdgpu_display_manager *dm, if (connector_type == DRM_MODE_CONNECTOR_HDMIA
> ||
>  	    connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
>  	    connector_type == DRM_MODE_CONNECTOR_eDP) {
> -		drm_object_attach_property(
> -			&aconnector->base.base,
> -			dm->ddev-
>mode_config.hdr_output_metadata_property, 0);
> +		
drm_connector_attach_hdr_output_metadata_property(&aconnector->base);
> 
>  		if (!aconnector->mst_port)
>  			
drm_connector_attach_vrr_capable_property(&aconnector->base);
> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index
> dda4fa9a1a08..f24bbb840dbf 100644
> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> @@ -2492,8 +2492,7 @@ static int dw_hdmi_connector_create(struct dw_hdmi
> *hdmi) drm_connector_attach_max_bpc_property(connector, 8, 16);
> 
>  	if (hdmi->version >= 0x200a && hdmi->plat_data->use_drm_infoframe)
> -		drm_object_attach_property(&connector->base,
> -			connector->dev-
>mode_config.hdr_output_metadata_property, 0);
> +		
drm_connector_attach_hdr_output_metadata_property(connector);
> 
>  	drm_connector_attach_encoder(connector, hdmi->bridge.encoder);
> 
> diff --git a/drivers/gpu/drm/drm_connector.c
> b/drivers/gpu/drm/drm_connector.c index 98b6ec45ef96..e25248e23e18 100644
> --- a/drivers/gpu/drm/drm_connector.c
> +++ b/drivers/gpu/drm/drm_connector.c
> @@ -2149,6 +2149,27 @@ int drm_connector_attach_max_bpc_property(struct
> drm_connector *connector, }
>  EXPORT_SYMBOL(drm_connector_attach_max_bpc_property);
> 
> +/**
> + * drm_connector_attach_hdr_output_metadata_property - attach
> "HDR_OUTPUT_METADA" property + * @connector: connector to attach the
> property on.
> + *
> + * This is used to allow the userspace to send HDR Metadata to the
> + * driver.
> + *
> + * Returns:
> + * Zero on success, negative errno on failure.
> + */
> +int drm_connector_attach_hdr_output_metadata_property(struct drm_connector
> *connector) +{
> +	struct drm_device *dev = connector->dev;
> +	struct drm_property *prop = dev-
>mode_config.hdr_output_metadata_property;
> +
> +	drm_object_attach_property(&connector->base, prop, 0);
> +
> +	return 0;
> +}
> +EXPORT_SYMBOL(drm_connector_attach_hdr_output_metadata_property);
> +
>  /**
>   * drm_connector_set_vrr_capable_property - sets the variable refresh rate
>   * capable property for a connector
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c
> b/drivers/gpu/drm/i915/display/intel_hdmi.c index
> c5959590562b..52c051efb7b7 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
> @@ -2958,8 +2958,7 @@ intel_hdmi_add_properties(struct intel_hdmi
> *intel_hdmi, struct drm_connector *c
> drm_connector_attach_content_type_property(connector);
> 
>  	if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> -		drm_object_attach_property(&connector->base,
> -			connector->dev-
>mode_config.hdr_output_metadata_property, 0);
> +		
drm_connector_attach_hdr_output_metadata_property(connector);
> 
>  	if (!HAS_GMCH(dev_priv))
>  		drm_connector_attach_max_bpc_property(connector, 8, 
12);
> diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
> index 1922b278ffad..32172dab8427 100644
> --- a/include/drm/drm_connector.h
> +++ b/include/drm/drm_connector.h
> @@ -1671,6 +1671,7 @@ 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_hdr_output_metadata_property(struct drm_connector
> *connector); int drm_mode_create_aspect_ratio_property(struct drm_device
> *dev); int drm_mode_create_hdmi_colorspace_property(struct drm_connector
> *connector); int drm_mode_create_dp_colorspace_property(struct
> drm_connector *connector);

For bridge part:
Reviewed-by: Jernej Skrabec <jernej.skrabec at siol.net>

Best regards,
Jernej