aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/dss.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/omap2/dss/dss.h')
-rw-r--r--drivers/video/omap2/dss/dss.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index a13b3055a447..f3fa4454446e 100644
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -179,6 +179,7 @@ int dss_mgr_set_device(struct omap_overlay_manager *mgr,
179int dss_mgr_unset_device(struct omap_overlay_manager *mgr); 179int dss_mgr_unset_device(struct omap_overlay_manager *mgr);
180void dss_mgr_set_timings(struct omap_overlay_manager *mgr, 180void dss_mgr_set_timings(struct omap_overlay_manager *mgr,
181 struct omap_video_timings *timings); 181 struct omap_video_timings *timings);
182const struct omap_video_timings *dss_mgr_get_timings(struct omap_overlay_manager *mgr);
182 183
183bool dss_ovl_is_enabled(struct omap_overlay *ovl); 184bool dss_ovl_is_enabled(struct omap_overlay *ovl);
184int dss_ovl_enable(struct omap_overlay *ovl); 185int dss_ovl_enable(struct omap_overlay *ovl);
@@ -211,8 +212,8 @@ int dss_mgr_simple_check(struct omap_overlay_manager *mgr,
211int dss_mgr_check_timings(struct omap_overlay_manager *mgr, 212int dss_mgr_check_timings(struct omap_overlay_manager *mgr,
212 const struct omap_video_timings *timings); 213 const struct omap_video_timings *timings);
213int dss_mgr_check(struct omap_overlay_manager *mgr, 214int dss_mgr_check(struct omap_overlay_manager *mgr,
214 struct omap_dss_device *dssdev,
215 struct omap_overlay_manager_info *info, 215 struct omap_overlay_manager_info *info,
216 const struct omap_video_timings *mgr_timings,
216 struct omap_overlay_info **overlay_infos); 217 struct omap_overlay_info **overlay_infos);
217 218
218/* overlay */ 219/* overlay */
@@ -222,8 +223,8 @@ void dss_overlay_setup_dispc_manager(struct omap_overlay_manager *mgr);
222void dss_recheck_connections(struct omap_dss_device *dssdev, bool force); 223void dss_recheck_connections(struct omap_dss_device *dssdev, bool force);
223int dss_ovl_simple_check(struct omap_overlay *ovl, 224int dss_ovl_simple_check(struct omap_overlay *ovl,
224 const struct omap_overlay_info *info); 225 const struct omap_overlay_info *info);
225int dss_ovl_check(struct omap_overlay *ovl, 226int dss_ovl_check(struct omap_overlay *ovl, struct omap_overlay_info *info,
226 struct omap_overlay_info *info, struct omap_dss_device *dssdev); 227 const struct omap_video_timings *mgr_timings);
227 228
228/* DSS */ 229/* DSS */
229int dss_init_platform_driver(void); 230int dss_init_platform_driver(void);