drm/omap: move struct dss_mgr_ops to omapdrm/omapfb

This patch continues the work to create private versions of the
omapdss.h header for omapdrm and omapfb. This one moves 'struct dss_mgr_ops'.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index d33a8e4f07d14ee9676c59c45b16a81ef61417fb..e0ca9ee9d28aa22848aec194c6c7af640192ea34 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -58,4 +58,26 @@ int dispc_ovl_setup(enum omap_plane plane, const struct omap_overlay_info *oi,
                bool replication, const struct omap_video_timings *mgr_timings,
                bool mem_to_mem);
 
+struct dss_mgr_ops {
+       int (*connect)(struct omap_overlay_manager *mgr,
+               struct omap_dss_device *dst);
+       void (*disconnect)(struct omap_overlay_manager *mgr,
+               struct omap_dss_device *dst);
+
+       void (*start_update)(struct omap_overlay_manager *mgr);
+       int (*enable)(struct omap_overlay_manager *mgr);
+       void (*disable)(struct omap_overlay_manager *mgr);
+       void (*set_timings)(struct omap_overlay_manager *mgr,
+                       const struct omap_video_timings *timings);
+       void (*set_lcd_config)(struct omap_overlay_manager *mgr,
+                       const struct dss_lcd_mgr_config *config);
+       int (*register_framedone_handler)(struct omap_overlay_manager *mgr,
+                       void (*handler)(void *), void *data);
+       void (*unregister_framedone_handler)(struct omap_overlay_manager *mgr,
+                       void (*handler)(void *), void *data);
+};
+
+int dss_install_mgr_ops(const struct dss_mgr_ops *mgr_ops);
+void dss_uninstall_mgr_ops(void);
+
 #endif /* __OMAP_DRM_DSS_H */

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.h b/drivers/video/fbdev/omap2/omapfb/dss/dss.h
index 86ed67ba4d5827a2336684719fb607a4f400b644..bfceaeedc6c57a441ccbb53c802429acddd7f8ec 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/dss.h
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.h
@@ -503,4 +503,28 @@ int dss_pll_write_config_type_b(struct dss_pll *pll,
                const struct dss_pll_clock_info *cinfo);
 int dss_pll_wait_reset_done(struct dss_pll *pll);
 
+/* compat */
+
+struct dss_mgr_ops {
+       int (*connect)(struct omap_overlay_manager *mgr,
+               struct omap_dss_device *dst);
+       void (*disconnect)(struct omap_overlay_manager *mgr,
+               struct omap_dss_device *dst);
+
+       void (*start_update)(struct omap_overlay_manager *mgr);
+       int (*enable)(struct omap_overlay_manager *mgr);
+       void (*disable)(struct omap_overlay_manager *mgr);
+       void (*set_timings)(struct omap_overlay_manager *mgr,
+                       const struct omap_video_timings *timings);
+       void (*set_lcd_config)(struct omap_overlay_manager *mgr,
+                       const struct dss_lcd_mgr_config *config);
+       int (*register_framedone_handler)(struct omap_overlay_manager *mgr,
+                       void (*handler)(void *), void *data);
+       void (*unregister_framedone_handler)(struct omap_overlay_manager *mgr,
+                       void (*handler)(void *), void *data);
+};
+
+int dss_install_mgr_ops(const struct dss_mgr_ops *mgr_ops);
+void dss_uninstall_mgr_ops(void);
+
 #endif

diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 0464dd69a87dac4b1d062d1c354d8212d1c753a1..88231883cae5fd0e08e6bd667be98c34486e02c1 100644 (file)
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -894,28 +894,6 @@ int omap_dispc_unregister_isr(omap_dispc_isr_t isr, void *arg, u32 mask);
 int omapdss_compat_init(void);
 void omapdss_compat_uninit(void);
 
-struct dss_mgr_ops {
-       int (*connect)(struct omap_overlay_manager *mgr,
-               struct omap_dss_device *dst);
-       void (*disconnect)(struct omap_overlay_manager *mgr,
-               struct omap_dss_device *dst);
-
-       void (*start_update)(struct omap_overlay_manager *mgr);
-       int (*enable)(struct omap_overlay_manager *mgr);
-       void (*disable)(struct omap_overlay_manager *mgr);
-       void (*set_timings)(struct omap_overlay_manager *mgr,
-                       const struct omap_video_timings *timings);
-       void (*set_lcd_config)(struct omap_overlay_manager *mgr,
-                       const struct dss_lcd_mgr_config *config);
-       int (*register_framedone_handler)(struct omap_overlay_manager *mgr,
-                       void (*handler)(void *), void *data);
-       void (*unregister_framedone_handler)(struct omap_overlay_manager *mgr,
-                       void (*handler)(void *), void *data);
-};
-
-int dss_install_mgr_ops(const struct dss_mgr_ops *mgr_ops);
-void dss_uninstall_mgr_ops(void);
-
 int dss_mgr_connect(struct omap_overlay_manager *mgr,
                struct omap_dss_device *dst);
 void dss_mgr_disconnect(struct omap_overlay_manager *mgr,