Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[deliverable/linux.git] / include / drm / drm_mode.h

diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
index 4a0aae38e1602481ad1f7c0f090e7d4b4532ba6f..5581980b14f606e593e9827e175980e5a50802f0 100644 (file)
--- a/include/drm/drm_mode.h
+++ b/include/drm/drm_mode.h
@@ -230,6 +230,7 @@ struct drm_mode_get_connector {
 #define DRM_MODE_PROP_IMMUTABLE        (1<<2)
 #define DRM_MODE_PROP_ENUM     (1<<3) /* enumerated type with text strings */
 #define DRM_MODE_PROP_BLOB     (1<<4)
+#define DRM_MODE_PROP_BITMASK  (1<<5) /* bitmask of enumerated types */
 
 struct drm_mode_property_enum {
        __u64 value;
@@ -254,6 +255,21 @@ struct drm_mode_connector_set_property {
        __u32 connector_id;
 };
 
+struct drm_mode_obj_get_properties {
+       __u64 props_ptr;
+       __u64 prop_values_ptr;
+       __u32 count_props;
+       __u32 obj_id;
+       __u32 obj_type;
+};
+
+struct drm_mode_obj_set_property {
+       __u64 value;
+       __u32 prop_id;
+       __u32 obj_id;
+       __u32 obj_type;
+};
+
 struct drm_mode_get_blob {
        __u32 blob_id;
        __u32 length;