diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_connector.h | 2 | ||||
| -rw-r--r-- | include/drm/drm_crtc.h | 12 | ||||
| -rw-r--r-- | include/drm/drm_encoder.h | 2 | ||||
| -rw-r--r-- | include/drm/drm_framebuffer.h | 2 | ||||
| -rw-r--r-- | include/drm/drm_mode_object.h (renamed from include/drm/drm_modeset.h) | 10 | ||||
| -rw-r--r-- | include/drm/drm_modes.h | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index f1576db..66b7d67 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -25,7 +25,7 @@ #include <linux/list.h> #include <linux/ctype.h> -#include <drm/drm_modeset.h> +#include <drm/drm_mode_object.h> struct drm_connector_helper_funcs; struct drm_device; diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index c459867..8ea3e65 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -36,7 +36,7 @@ #include <uapi/drm/drm_fourcc.h> #include <drm/drm_modeset_lock.h> #include <drm/drm_rect.h> -#include <drm/drm_modeset.h> +#include <drm/drm_mode_object.h> #include <drm/drm_framebuffer.h> #include <drm/drm_modes.h> #include <drm/drm_connector.h> @@ -2116,16 +2116,6 @@ static inline bool drm_property_type_is(struct drm_property *property, return property->flags & type; } -extern int drm_object_property_set_value(struct drm_mode_object *obj, - struct drm_property *property, - uint64_t val); -extern int drm_object_property_get_value(struct drm_mode_object *obj, - struct drm_property *property, - uint64_t *value); - -extern void drm_object_attach_property(struct drm_mode_object *obj, - struct drm_property *property, - uint64_t init_val); extern struct drm_property *drm_property_create(struct drm_device *dev, int flags, const char *name, int num_values); extern struct drm_property *drm_property_create_enum(struct drm_device *dev, int flags, diff --git a/include/drm/drm_encoder.h b/include/drm/drm_encoder.h index 3d7350f..fce0203 100644 --- a/include/drm/drm_encoder.h +++ b/include/drm/drm_encoder.h @@ -25,7 +25,7 @@ #include <linux/list.h> #include <linux/ctype.h> -#include <drm/drm_modeset.h> +#include <drm/drm_mode_object.h> /** * struct drm_encoder_funcs - encoder controls diff --git a/include/drm/drm_framebuffer.h b/include/drm/drm_framebuffer.h index 50deb40..b2554c5 100644 --- a/include/drm/drm_framebuffer.h +++ b/include/drm/drm_framebuffer.h @@ -25,7 +25,7 @@ #include <linux/list.h> #include <linux/ctype.h> -#include <drm/drm_modeset.h> +#include <drm/drm_mode_object.h> struct drm_framebuffer; struct drm_file; diff --git a/include/drm/drm_modeset.h b/include/drm/drm_mode_object.h index fe910d5..c0e4414 100644 --- a/include/drm/drm_modeset.h +++ b/include/drm/drm_mode_object.h @@ -67,4 +67,14 @@ struct drm_mode_object *drm_mode_object_find(struct drm_device *dev, void drm_mode_object_reference(struct drm_mode_object *obj); void drm_mode_object_unreference(struct drm_mode_object *obj); +int drm_object_property_set_value(struct drm_mode_object *obj, + struct drm_property *property, + uint64_t val); +int drm_object_property_get_value(struct drm_mode_object *obj, + struct drm_property *property, + uint64_t *value); + +void drm_object_attach_property(struct drm_mode_object *obj, + struct drm_property *property, + uint64_t init_val); #endif diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h index 1621e9b..011f199 100644 --- a/include/drm/drm_modes.h +++ b/include/drm/drm_modes.h @@ -27,7 +27,7 @@ #ifndef __DRM_MODES_H__ #define __DRM_MODES_H__ -#include <drm/drm_modeset.h> +#include <drm/drm_mode_object.h> #include <drm/drm_connector.h> /* |