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

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

drm/omap: convert dss_mgr_unregister_framedone_handler to accept omap_channel 



We are removing uses of 'struct omap_overlay_manager'. This patch
changes dss_mgr_unregister_framedone_handler() to accept 'enum
omap_channel' instead of 'struct omap_overlay_manager'.

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

drivers/gpu/drm/omapdrm/dss/dsi.c

+2 −2
Original line number Diff line number Diff line
@@ -4156,7 +4156,7 @@ static int dsi_display_init_dispc(struct platform_device *dsidev, 
	return 0;

err1:

	if (dsi->mode == OMAP_DSS_DSI_CMD_MODE)

		dss_mgr_unregister_framedone_handler(mgr,

		dss_mgr_unregister_framedone_handler(mgr->id,

				dsi_framedone_irq_callback, dsidev);

err:

	dss_select_lcd_clk_source(mgr->id, OMAP_DSS_CLK_SRC_FCK);
@@ -4169,7 +4169,7 @@ static void dsi_display_uninit_dispc(struct platform_device *dsidev, 
	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);



	if (dsi->mode == OMAP_DSS_DSI_CMD_MODE)

		dss_mgr_unregister_framedone_handler(mgr,

		dss_mgr_unregister_framedone_handler(mgr->id,

				dsi_framedone_irq_callback, dsidev);



	dss_select_lcd_clk_source(mgr->id, OMAP_DSS_CLK_SRC_FCK);

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

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ void dss_mgr_disable(enum omap_channel channel); 
void dss_mgr_start_update(enum omap_channel channel);

int dss_mgr_register_framedone_handler(enum omap_channel channel,

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

void dss_mgr_unregister_framedone_handler(struct omap_overlay_manager *mgr,

void dss_mgr_unregister_framedone_handler(enum omap_channel channel,

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



#endif /* __OMAP_DRM_DSS_H */

drivers/gpu/drm/omapdrm/dss/output.c

+2 −2
Original line number Diff line number Diff line
@@ -241,9 +241,9 @@ int dss_mgr_register_framedone_handler(enum omap_channel channel, 
}

EXPORT_SYMBOL(dss_mgr_register_framedone_handler);



void dss_mgr_unregister_framedone_handler(struct omap_overlay_manager *mgr,

void dss_mgr_unregister_framedone_handler(enum omap_channel channel,

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

{

	dss_mgr_ops->unregister_framedone_handler(mgr->id, handler, data);

	dss_mgr_ops->unregister_framedone_handler(channel, handler, data);

}

EXPORT_SYMBOL(dss_mgr_unregister_framedone_handler);