Revert "BACKPORT: drm: Add HDR source metadata property"
This reverts commit 4ae8f7c45a.
We don't need these drm blob properties on this branch.
Bug: 152417756
Signed-off-by: Alistair Delva <adelva@google.com>
Change-Id: Ib715f4e3b6394091c8b537d4cb534c3b31d7f8c8
This commit is contained in:
Alistair Delva
parent
a295300648
commit
c4ea3263ea
6 changed files with 0 additions and 85 deletions
|
|
@ -1350,8 +1350,6 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector,
|
|||
{
|
||||
struct drm_device *dev = connector->dev;
|
||||
struct drm_mode_config *config = &dev->mode_config;
|
||||
bool replaced = false;
|
||||
int ret;
|
||||
|
||||
if (property == config->prop_crtc_id) {
|
||||
struct drm_crtc *crtc = drm_crtc_find(dev, NULL, val);
|
||||
|
|
@ -1400,13 +1398,6 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector,
|
|||
*/
|
||||
if (state->link_status != DRM_LINK_STATUS_GOOD)
|
||||
state->link_status = val;
|
||||
} else if (property == config->hdr_output_metadata_property) {
|
||||
ret = drm_atomic_replace_property_blob_from_id(dev,
|
||||
&state->hdr_output_metadata,
|
||||
val,
|
||||
sizeof(struct hdr_output_metadata), -1,
|
||||
&replaced);
|
||||
return ret;
|
||||
} else if (property == config->aspect_ratio_property) {
|
||||
state->picture_aspect_ratio = val;
|
||||
} else if (property == config->content_type_property) {
|
||||
|
|
@ -1522,9 +1513,6 @@ drm_atomic_connector_get_property(struct drm_connector *connector,
|
|||
*val = state->colorspace;
|
||||
} else if (property == connector->scaling_mode_property) {
|
||||
*val = state->scaling_mode;
|
||||
} else if (property == config->hdr_output_metadata_property) {
|
||||
*val = state->hdr_output_metadata ?
|
||||
state->hdr_output_metadata->base.id : 0;
|
||||
} else if (property == connector->content_protection_property) {
|
||||
*val = state->content_protection;
|
||||
} else if (property == config->writeback_fb_id_property) {
|
||||
|
|
|
|||
|
|
@ -1065,12 +1065,6 @@ int drm_connector_create_standard_properties(struct drm_device *dev)
|
|||
return -ENOMEM;
|
||||
dev->mode_config.non_desktop_property = prop;
|
||||
|
||||
prop = drm_property_create(dev, DRM_MODE_PROP_BLOB,
|
||||
"HDR_OUTPUT_METADATA", 0);
|
||||
if (!prop)
|
||||
return -ENOMEM;
|
||||
dev->mode_config.hdr_output_metadata_property = prop;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -502,13 +502,6 @@ struct drm_connector_state {
|
|||
* drm_writeback_signal_completion()
|
||||
*/
|
||||
struct drm_writeback_job *writeback_job;
|
||||
|
||||
/**
|
||||
|
||||
* @hdr_output_metadata:
|
||||
* DRM blob property for HDR output metadata
|
||||
*/
|
||||
struct drm_property_blob *hdr_output_metadata;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1179,10 +1172,6 @@ struct drm_connector {
|
|||
*/
|
||||
struct llist_node free_node;
|
||||
|
||||
/* HDR metdata */
|
||||
struct hdr_output_metadata hdr_output_metadata;
|
||||
struct hdr_sink_metadata hdr_sink_metadata;
|
||||
|
||||
/**
|
||||
* @panel:
|
||||
*
|
||||
|
|
|
|||
|
|
@ -807,13 +807,6 @@ struct drm_mode_config {
|
|||
*/
|
||||
struct drm_property *writeback_out_fence_ptr_property;
|
||||
|
||||
/**
|
||||
* 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;
|
||||
|
||||
/* dumb ioctl parameters */
|
||||
uint32_t preferred_depth, prefer_shadow;
|
||||
|
||||
|
|
|
|||
|
|
@ -137,16 +137,6 @@ enum hdmi_content_type {
|
|||
HDMI_CONTENT_TYPE_GAME,
|
||||
};
|
||||
|
||||
enum hdmi_metadata_type {
|
||||
HDMI_STATIC_METADATA_TYPE1 = 1,
|
||||
};
|
||||
|
||||
enum hdmi_eotf {
|
||||
HDMI_EOTF_TRADITIONAL_GAMMA_SDR,
|
||||
HDMI_EOTF_TRADITIONAL_GAMMA_HDR,
|
||||
HDMI_EOTF_SMPTE_ST2084,
|
||||
};
|
||||
|
||||
struct hdmi_avi_infoframe {
|
||||
enum hdmi_infoframe_type type;
|
||||
unsigned char version;
|
||||
|
|
@ -306,22 +296,6 @@ struct hdmi_vendor_infoframe {
|
|||
unsigned int s3d_ext_data;
|
||||
};
|
||||
|
||||
/* HDR Metadata as per 861.G spec */
|
||||
struct hdr_static_metadata {
|
||||
__u8 eotf;
|
||||
__u8 metadata_type;
|
||||
__u16 max_cll;
|
||||
__u16 max_fall;
|
||||
__u16 min_cll;
|
||||
};
|
||||
|
||||
struct hdr_sink_metadata {
|
||||
__u32 metadata_type;
|
||||
union {
|
||||
struct hdr_static_metadata hdmi_type1;
|
||||
};
|
||||
};
|
||||
|
||||
int hdmi_vendor_infoframe_init(struct hdmi_vendor_infoframe *frame);
|
||||
ssize_t hdmi_vendor_infoframe_pack(struct hdmi_vendor_infoframe *frame,
|
||||
void *buffer, size_t size);
|
||||
|
|
|
|||
|
|
@ -641,29 +641,6 @@ struct drm_color_lut {
|
|||
__u16 reserved;
|
||||
};
|
||||
|
||||
/* HDR Metadata Infoframe as per 861.G spec */
|
||||
struct hdr_metadata_infoframe {
|
||||
__u8 eotf;
|
||||
__u8 metadata_type;
|
||||
struct {
|
||||
__u16 x, y;
|
||||
} display_primaries[3];
|
||||
struct {
|
||||
__u16 x, y;
|
||||
} white_point;
|
||||
__u16 max_display_mastering_luminance;
|
||||
__u16 min_display_mastering_luminance;
|
||||
__u16 max_cll;
|
||||
__u16 max_fall;
|
||||
};
|
||||
|
||||
struct hdr_output_metadata {
|
||||
__u32 metadata_type;
|
||||
union {
|
||||
struct hdr_metadata_infoframe hdmi_metadata_type1;
|
||||
};
|
||||
};
|
||||
|
||||
#define DRM_MODE_PAGE_FLIP_EVENT 0x01
|
||||
#define DRM_MODE_PAGE_FLIP_ASYNC 0x02
|
||||
#define DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE 0x4
|
||||
|
|
|
|||
Loading…
Reference in a new issue