Showing with 7 additions and 10 deletions.
  1. +3 −6 drivers/gpu/drm/drm_edid.c
  2. +1 −1 drivers/video/hdmi.c
  3. +1 −1 include/drm/drm_connector.h
  4. +2 −2 include/drm/drm_mode_config.h
9 changes: 3 additions & 6 deletions drivers/gpu/drm/drm_edid.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4890,10 +4890,10 @@ static bool is_hdmi2_sink(struct drm_connector *connector)
}

/**
* drm_hdmi_infoframe_set_hdr_metadata() - fill an HDMI AVI infoframe with
* drm_hdmi_infoframe_set_hdr_metadata() - fill an HDMI DRM infoframe with
* HDR metadata from userspace
* @frame: HDMI AVI infoframe
* @hdr_source_metadata: hdr_source_metadata info from userspace
* @frame: HDMI DRM infoframe
* @hdr_metadata: hdr_source_metadata info from userspace
*
* Return: 0 on success or a negative error code on failure.
*/
Expand Down Expand Up @@ -4930,9 +4930,6 @@ drm_hdmi_infoframe_set_hdr_metadata(struct hdmi_drm_infoframe *frame,
frame->max_fall = hdr_metadata->hdmi_metadata_type1.max_fall;
frame->max_cll = hdr_metadata->hdmi_metadata_type1.max_cll;

hdmi_infoframe_log(KERN_CRIT, NULL,
(union hdmi_infoframe *)frame);

return 0;
}
EXPORT_SYMBOL(drm_hdmi_infoframe_set_hdr_metadata);
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/hdmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ int hdmi_drm_infoframe_check(struct hdmi_drm_infoframe *frame)
EXPORT_SYMBOL(hdmi_drm_infoframe_check);

/**
* hdmi_drm_infoframe_pack() - write HDMI DRM infoframe to binary buffer
* hdmi_drm_infoframe_pack_only() - write HDMI DRM infoframe to binary buffer
* @frame: HDMI DRM infoframe
* @buffer: destination buffer
* @size: size of buffer
Expand Down
2 changes: 1 addition & 1 deletion include/drm/drm_connector.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ struct drm_connector_state {
u8 max_bpc;

/**
* @metadata_blob_ptr:
* @hdr_output_metadata:
* DRM blob property for HDR output metadata
*/
struct drm_property_blob *hdr_output_metadata;
Expand Down
4 changes: 2 additions & 2 deletions include/drm/drm_mode_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -836,8 +836,8 @@ struct drm_mode_config {
*/
struct drm_property *writeback_out_fence_ptr_property;

/*
* hdr_metadata_property: Connector property containing hdr metatda
/**
* @hdr_output_metadata_property: Connector property containing hdr metatda
* This will be provided by userspace compositors based on HDR content
*/
struct drm_property *hdr_output_metadata_property;
Expand Down