diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-08-29 10:27:51 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-08-29 15:37:13 +0200 |
| commit | 949619f32eee37a6385de1e976523501c8256768 (patch) | |
| tree | ca63ccb5ee58b89e664f7a7a0a3a6b9310193f42 /include | |
| parent | e03e6de03e931bd3d93b1e2a9dc7d0bf0b505287 (diff) | |
| download | talos-obmc-linux-949619f32eee37a6385de1e976523501c8256768.tar.gz talos-obmc-linux-949619f32eee37a6385de1e976523501c8256768.zip | |
drm: Extract drm_mode_object.[hc]
Just for the struct drm_mode_object base class. The header file was
already partially extracted to help untangle the include loops.
v2:
- Also move the generic get/set property ioctls. At first this seemed
like a bad idea since it requires making drm_mode_crtc_set_obj_prop
non-static. But eventually that will get split away too (like
the connector version already is) for both crtc and planes. Hence I
reconsidered.
- drm_mode_object.[hc] instead of drm_modeset.[hc], which requires
renaming the drm_modeset.h header I already started building up.
This is more consistent (matches the name of the main structure),
and I want to be able to use drm_modeset.[hc] for the basic modeset
init/cleanup functionality like drm_mode_config_init.
Reviewed-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20160829082757.17913-3-daniel.vetter@ffwll.ch
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 f1576db6c044..66b7d6744dd2 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 c459867ecb9c..8ea3e65fe0c2 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 3d7350f1fcc1..fce0203094f7 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 50deb40d3bfd..b2554c50a903 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 fe910d5efe12..c0e4414299f7 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 1621e9b32330..011f199d3bcf 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> /* |
