github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 22:52:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm: Remove global property HDR_PANEL_METADATA

Browse Source 
HDR_PANEL_METADATA has been hdmi private property, so remove
HDR_PANEL_METADATA in mode_config.

Fixes: 97fd2e42b6 ("drm: Add HDR panel metadata property")
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ia534d61d78edcdd2260b41d1c5a076f19034bf75
This commit is contained in:
Algea Cao 2020-08-21 14:32:14 +08:00 committed by Tao Huang
parent 0976d53030
commit 327eddb701
3 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/gpu/drm/drm_connector.c
View File

@ -1026,14 +1026,6 @@ int drm_connector_create_standard_properties(struct drm_device *dev)
return -ENOMEM;
dev->mode_config.hdr_output_metadata_property = prop;
prop = drm_property_create(dev,
DRM_MODE_PROP_BLOB |
DRM_MODE_PROP_IMMUTABLE,
"HDR_PANEL_METADATA", 0);
if (!prop)
return -ENOMEM;
dev->mode_config.hdr_panel_metadata_property = prop;
return 0;
}
@ -1583,28 +1575,6 @@ int drm_connector_update_edid_property(struct drm_connector *connector,
}
EXPORT_SYMBOL(drm_connector_update_edid_property);
int
drm_mode_connector_update_hdr_property(struct drm_connector *connector,
const struct hdr_static_metadata *data)
{
struct drm_device *dev = connector->dev;
size_t size = sizeof(*data);
struct drm_property *property =
dev->mode_config.hdr_panel_metadata_property;
struct drm_property_blob **replace =
&connector->state->hdr_panel_blob_ptr;
int ret;
ret = drm_property_replace_global_blob(dev,
replace,
size,
data,
&connector->base,
property);
return ret;
}
EXPORT_SYMBOL(drm_mode_connector_update_hdr_property);
/**
* drm_connector_set_link_status_property - Set link status property of a connector
* @connector: drm connector

3
include/drm/drm_connector.h
View File

@ -1313,9 +1313,6 @@ int drm_connector_set_path_property(struct drm_connector *connector,
int drm_connector_set_tile_property(struct drm_connector *connector);
int drm_connector_update_edid_property(struct drm_connector *connector,
const struct edid *edid);
int
drm_mode_connector_update_hdr_property(struct drm_connector *connector,
const struct hdr_static_metadata *data);
void drm_connector_set_link_status_property(struct drm_connector *connector,
uint64_t link_status);
int drm_connector_init_panel_orientation_property(

2
include/drm/drm_mode_config.h
View File

@ -814,8 +814,6 @@ struct drm_mode_config {
*/
struct drm_property *hdr_output_metadata_property;
struct drm_property *hdr_panel_metadata_property;
/* dumb ioctl parameters */
uint32_t preferred_depth, prefer_shadow;