Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit caaecd9a authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

drm/omap: move dss_mgr_* declarations to omapdrm/omapfb 



This patch continues the work to create private versions of the
omapdss.h header for omapdrm and omapfb. This one moves the dss_mgr_*
function declarations.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 564c7c75

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

+16 −0
Original line number Diff line number Diff line
@@ -80,4 +80,20 @@ struct dss_mgr_ops { 
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,

		struct omap_dss_device *dst);

void dss_mgr_set_timings(struct omap_overlay_manager *mgr,

		const struct omap_video_timings *timings);

void dss_mgr_set_lcd_config(struct omap_overlay_manager *mgr,

		const struct dss_lcd_mgr_config *config);

int dss_mgr_enable(struct omap_overlay_manager *mgr);

void dss_mgr_disable(struct omap_overlay_manager *mgr);

void dss_mgr_start_update(struct omap_overlay_manager *mgr);

int dss_mgr_register_framedone_handler(struct omap_overlay_manager *mgr,

		void (*handler)(void *), void *data);

void dss_mgr_unregister_framedone_handler(struct omap_overlay_manager *mgr,

		void (*handler)(void *), void *data);



#endif /* __OMAP_DRM_DSS_H */

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

+16 −0
Original line number Diff line number Diff line
@@ -527,4 +527,20 @@ struct dss_mgr_ops { 
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,

		struct omap_dss_device *dst);

void dss_mgr_set_timings(struct omap_overlay_manager *mgr,

		const struct omap_video_timings *timings);

void dss_mgr_set_lcd_config(struct omap_overlay_manager *mgr,

		const struct dss_lcd_mgr_config *config);

int dss_mgr_enable(struct omap_overlay_manager *mgr);

void dss_mgr_disable(struct omap_overlay_manager *mgr);

void dss_mgr_start_update(struct omap_overlay_manager *mgr);

int dss_mgr_register_framedone_handler(struct omap_overlay_manager *mgr,

		void (*handler)(void *), void *data);

void dss_mgr_unregister_framedone_handler(struct omap_overlay_manager *mgr,

		void (*handler)(void *), void *data);



#endif

include/video/omapdss.h

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



int dss_mgr_connect(struct omap_overlay_manager *mgr,

		struct omap_dss_device *dst);

void dss_mgr_disconnect(struct omap_overlay_manager *mgr,

		struct omap_dss_device *dst);

void dss_mgr_set_timings(struct omap_overlay_manager *mgr,

		const struct omap_video_timings *timings);

void dss_mgr_set_lcd_config(struct omap_overlay_manager *mgr,

		const struct dss_lcd_mgr_config *config);

int dss_mgr_enable(struct omap_overlay_manager *mgr);

void dss_mgr_disable(struct omap_overlay_manager *mgr);

void dss_mgr_start_update(struct omap_overlay_manager *mgr);

int dss_mgr_register_framedone_handler(struct omap_overlay_manager *mgr,

		void (*handler)(void *), void *data);

void dss_mgr_unregister_framedone_handler(struct omap_overlay_manager *mgr,

		void (*handler)(void *), void *data);



static inline bool omapdss_device_is_connected(struct omap_dss_device *dssdev)

{

	return dssdev->src;