Commit 564c7c75 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

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: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 35a339ac

drivers/gpu/drm/omapdrm/dss/omapdss.h

+22 −0
Original line number Diff line number Diff line
@@ -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 */

drivers/video/fbdev/omap2/omapfb/dss/dss.h

+24 −0
Original line number Diff line number Diff line
@@ -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

include/video/omapdss.h

+0 −22
Original line number Diff line number Diff line
@@ -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,