aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGreg Hackmann <ghackmann@google.com>2013-06-11 12:59:41 -0700
committerGreg Hackmann <ghackmann@google.com>2013-10-11 16:47:44 -0700
commit8bf80c569500ee125d6f85290521b0c1c3f64814 (patch)
tree07362c4e0765a92b425aebd9808c9bca0483d54a /include
parentb07062e41853a8096096d3a75767b955e13a57bb (diff)
video: adf: add supported formats to adf_overlay_engine_data
Change-Id: If2aa783b9ece60160f465bf697508fc58682e1bc Signed-off-by: Greg Hackmann <ghackmann@google.com>
Diffstat (limited to 'include')
-rw-r--r--include/uapi/video/adf.h6
-rw-r--r--include/video/adf.h3
2 files changed, 8 insertions, 1 deletions
diff --git a/include/uapi/video/adf.h b/include/uapi/video/adf.h
index 4b9e60c84e6..108064626e0 100644
--- a/include/uapi/video/adf.h
+++ b/include/uapi/video/adf.h
@@ -274,15 +274,21 @@ struct adf_interface_data {
* struct adf_overlay_engine_data - describes an overlay engine
*
* @name: overlay engine's name
+ * @n_supported_formats: number of supported formats
+ * @supported_formats: list of supported formats
* @custom_data_size: size of driver-private data
* @custom_data: driver-private data
*/
struct adf_overlay_engine_data {
char name[ADF_NAME_LEN];
+ size_t n_supported_formats;
+ __u32 __user *supported_formats;
+
size_t custom_data_size;
void __user *custom_data;
};
+#define ADF_MAX_SUPPORTED_FORMATS (PAGE_SIZE / sizeof(__u32))
#define ADF_SET_EVENT _IOW('D', 0, struct adf_set_event)
#define ADF_BLANK _IOW('D', 1, __u8)
diff --git a/include/video/adf.h b/include/video/adf.h
index 6c2191a318a..eb7b9be19c7 100644
--- a/include/video/adf.h
+++ b/include/video/adf.h
@@ -374,7 +374,8 @@ struct adf_interface {
* @base: common operations (see &struct adf_obj_ops)
*
* @supported_formats: list of fourccs the overlay engine can scan out
- * @n_supported_formats: length of supported_formats
+ * @n_supported_formats: length of supported_formats, up to
+ * ADF_MAX_SUPPORTED_FORMATS
*/
struct adf_overlay_engine_ops {
const struct adf_obj_ops base;