From e45fc30f3ee796625e26a8a9d7936bd273e1018f Mon Sep 17 00:00:00 2001 From: Greg Hackmann Date: Fri, 13 Sep 2013 11:23:05 -0700 Subject: video: adf: add informational flags to interfaces Informational flags don't affect ADF directly but may be useful to clients. Currently used to indicate primary and external displays. Change-Id: I343c7f0148da0869244c8e818350e9855525df85 Signed-off-by: Greg Hackmann --- include/uapi/video/adf.h | 4 ++++ include/video/adf.h | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/uapi/video/adf.h b/include/uapi/video/adf.h index e35a505882da..2ba345ca458b 100644 --- a/include/uapi/video/adf.h +++ b/include/uapi/video/adf.h @@ -36,6 +36,9 @@ enum adf_interface_type { ADF_INTF_TYPE_MAX = (~(__u32)0), }; +#define ADF_INTF_FLAG_PRIMARY (1 << 0) +#define ADF_INTF_FLAG_EXTERNAL (1 << 1) + enum adf_event_type { ADF_EVENT_VSYNC = 0, ADF_EVENT_HOTPLUG = 1, @@ -256,6 +259,7 @@ struct adf_interface_data { __u32 type; __u32 id; /* e.g. type=ADF_INTF_TYPE_DSI, id=1 => DSI.1 */ + __u32 flags; __u8 dpms_state; __u8 hotplug_detect; diff --git a/include/video/adf.h b/include/video/adf.h index eb7b9be19c7e..82d49fcf00cf 100644 --- a/include/video/adf.h +++ b/include/video/adf.h @@ -355,6 +355,7 @@ struct adf_interface { enum adf_interface_type type; u32 idx; + u32 flags; wait_queue_head_t vsync_wait; ktime_t vsync_timestamp; @@ -405,9 +406,10 @@ int __printf(4, 5) adf_device_init(struct adf_device *dev, struct device *parent, const struct adf_device_ops *ops, const char *fmt, ...); void adf_device_destroy(struct adf_device *dev); -int __printf(6, 7) adf_interface_init(struct adf_interface *intf, +int __printf(7, 8) adf_interface_init(struct adf_interface *intf, struct adf_device *dev, enum adf_interface_type type, u32 idx, - const struct adf_interface_ops *ops, const char *fmt, ...); + u32 flags, const struct adf_interface_ops *ops, const char *fmt, + ...); void adf_interface_destroy(struct adf_interface *intf); static inline struct adf_device *adf_interface_parent( struct adf_interface *intf) -- cgit v1.2.3