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

Commit 11622d4c authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Daniel Vetter
Browse files

drm: bridge: Make (pre/post) enable/disable callbacks optional 



Instead of forcing bridges to implement empty callbacks make them all
optional.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1456480266-7904-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com


Acked-by: default avatarArchit Taneja <architt@codeaurora.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent b47bcb93

drivers/gpu/drm/drm_bridge.c

+8 −4
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ void drm_bridge_disable(struct drm_bridge *bridge) 


	drm_bridge_disable(bridge->next);



	if (bridge->funcs->disable)

		bridge->funcs->disable(bridge);

}

EXPORT_SYMBOL(drm_bridge_disable);
@@ -206,6 +207,7 @@ void drm_bridge_post_disable(struct drm_bridge *bridge) 
	if (!bridge)

		return;



	if (bridge->funcs->post_disable)

		bridge->funcs->post_disable(bridge);



	drm_bridge_post_disable(bridge->next);
@@ -256,6 +258,7 @@ void drm_bridge_pre_enable(struct drm_bridge *bridge) 


	drm_bridge_pre_enable(bridge->next);



	if (bridge->funcs->pre_enable)

		bridge->funcs->pre_enable(bridge);

}

EXPORT_SYMBOL(drm_bridge_pre_enable);
@@ -276,6 +279,7 @@ void drm_bridge_enable(struct drm_bridge *bridge) 
	if (!bridge)

		return;



	if (bridge->funcs->enable)

		bridge->funcs->enable(bridge);



	drm_bridge_enable(bridge->next);

include/drm/drm_crtc.h

+8 −0
Original line number Diff line number Diff line
@@ -1596,6 +1596,8 @@ struct drm_bridge_funcs { 
	 *

	 * The bridge can assume that the display pipe (i.e. clocks and timing

	 * signals) feeding it is still running when this callback is called.

	 *

	 * The disable callback is optional.

	 */

	void (*disable)(struct drm_bridge *bridge);
@@ -1612,6 +1614,8 @@ struct drm_bridge_funcs { 
	 * The bridge must assume that the display pipe (i.e. clocks and timing

	 * singals) feeding it is no longer running when this callback is

	 * called.

	 *

	 * The post_disable callback is optional.

	 */

	void (*post_disable)(struct drm_bridge *bridge);
@@ -1640,6 +1644,8 @@ struct drm_bridge_funcs { 
	 * will not yet be running when this callback is called. The bridge must

	 * not enable the display link feeding the next bridge in the chain (if

	 * there is one) when this callback is called.

	 *

	 * The pre_enable callback is optional.

	 */

	void (*pre_enable)(struct drm_bridge *bridge);
@@ -1657,6 +1663,8 @@ struct drm_bridge_funcs { 
	 * signals) feeding it is running when this callback is called. This

	 * callback must enable the display link feeding the next bridge in the

	 * chain if there is one.

	 *

	 * The enable callback is optional.

	 */

	void (*enable)(struct drm_bridge *bridge);

};