aboutsummaryrefslogtreecommitdiffstats
path: root/include/video
diff options
context:
space:
mode:
Diffstat (limited to 'include/video')
-rw-r--r--include/video/omapdss.h23
1 files changed, 23 insertions, 0 deletions
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 898f81247859..4f52f523fba4 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -689,6 +689,9 @@ struct omap_dss_driver {
689 int (*probe)(struct omap_dss_device *); 689 int (*probe)(struct omap_dss_device *);
690 void (*remove)(struct omap_dss_device *); 690 void (*remove)(struct omap_dss_device *);
691 691
692 int (*connect)(struct omap_dss_device *dssdev);
693 void (*disconnect)(struct omap_dss_device *dssdev);
694
692 int (*enable)(struct omap_dss_device *display); 695 int (*enable)(struct omap_dss_device *display);
693 void (*disable)(struct omap_dss_device *display); 696 void (*disable)(struct omap_dss_device *display);
694 int (*run_test)(struct omap_dss_device *display, int test); 697 int (*run_test)(struct omap_dss_device *display, int test);
@@ -889,6 +892,11 @@ int omapdss_compat_init(void);
889void omapdss_compat_uninit(void); 892void omapdss_compat_uninit(void);
890 893
891struct dss_mgr_ops { 894struct dss_mgr_ops {
895 int (*connect)(struct omap_overlay_manager *mgr,
896 struct omap_dss_output *dst);
897 void (*disconnect)(struct omap_overlay_manager *mgr,
898 struct omap_dss_output *dst);
899
892 void (*start_update)(struct omap_overlay_manager *mgr); 900 void (*start_update)(struct omap_overlay_manager *mgr);
893 int (*enable)(struct omap_overlay_manager *mgr); 901 int (*enable)(struct omap_overlay_manager *mgr);
894 void (*disable)(struct omap_overlay_manager *mgr); 902 void (*disable)(struct omap_overlay_manager *mgr);
@@ -905,6 +913,10 @@ struct dss_mgr_ops {
905int dss_install_mgr_ops(const struct dss_mgr_ops *mgr_ops); 913int dss_install_mgr_ops(const struct dss_mgr_ops *mgr_ops);
906void dss_uninstall_mgr_ops(void); 914void dss_uninstall_mgr_ops(void);
907 915
916int dss_mgr_connect(struct omap_overlay_manager *mgr,
917 struct omap_dss_output *dst);
918void dss_mgr_disconnect(struct omap_overlay_manager *mgr,
919 struct omap_dss_output *dst);
908void dss_mgr_set_timings(struct omap_overlay_manager *mgr, 920void dss_mgr_set_timings(struct omap_overlay_manager *mgr,
909 const struct omap_video_timings *timings); 921 const struct omap_video_timings *timings);
910void dss_mgr_set_lcd_config(struct omap_overlay_manager *mgr, 922void dss_mgr_set_lcd_config(struct omap_overlay_manager *mgr,
@@ -916,4 +928,15 @@ int dss_mgr_register_framedone_handler(struct omap_overlay_manager *mgr,
916 void (*handler)(void *), void *data); 928 void (*handler)(void *), void *data);
917void dss_mgr_unregister_framedone_handler(struct omap_overlay_manager *mgr, 929void dss_mgr_unregister_framedone_handler(struct omap_overlay_manager *mgr,
918 void (*handler)(void *), void *data); 930 void (*handler)(void *), void *data);
931
932static inline bool omapdss_device_is_connected(struct omap_dss_device *dssdev)
933{
934 return dssdev->output;
935}
936
937static inline bool omapdss_device_is_enabled(struct omap_dss_device *dssdev)
938{
939 return dssdev->state == OMAP_DSS_DISPLAY_ACTIVE;
940}
941
919#endif 942#endif