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

Commit fd30b38c authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Archit Taneja
Browse files

drm: bridge: dw-hdmi: Reorder functions to prepare for next commit 



The next commit will reference structures and functions in a way that
currently requires forward declarations. Reorder the functions to avoid
that. No functional change to the code is performed.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarJose Abreu <joabreu@synopsys.com>
Signed-off-by: default avatarArchit Taneja <architt@codeaurora.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20170117082910.27023-9-laurent.pinchart+renesas@ideasonboard.com
parent c608119d

drivers/gpu/drm/bridge/dw-hdmi.c

+36 −36
Original line number Diff line number Diff line
@@ -1575,42 +1575,6 @@ static void dw_hdmi_update_phy_mask(struct dw_hdmi *hdmi) 
		hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0);

}



static void dw_hdmi_bridge_mode_set(struct drm_bridge *bridge,

				    struct drm_display_mode *orig_mode,

				    struct drm_display_mode *mode)

{

	struct dw_hdmi *hdmi = bridge->driver_private;



	mutex_lock(&hdmi->mutex);



	/* Store the display mode for plugin/DKMS poweron events */

	memcpy(&hdmi->previous_mode, mode, sizeof(hdmi->previous_mode));



	mutex_unlock(&hdmi->mutex);

}



static void dw_hdmi_bridge_disable(struct drm_bridge *bridge)

{

	struct dw_hdmi *hdmi = bridge->driver_private;



	mutex_lock(&hdmi->mutex);

	hdmi->disabled = true;

	dw_hdmi_update_power(hdmi);

	dw_hdmi_update_phy_mask(hdmi);

	mutex_unlock(&hdmi->mutex);

}



static void dw_hdmi_bridge_enable(struct drm_bridge *bridge)

{

	struct dw_hdmi *hdmi = bridge->driver_private;



	mutex_lock(&hdmi->mutex);

	hdmi->disabled = false;

	dw_hdmi_update_power(hdmi);

	dw_hdmi_update_phy_mask(hdmi);

	mutex_unlock(&hdmi->mutex);

}



static enum drm_connector_status

dw_hdmi_connector_detect(struct drm_connector *connector, bool force)

{
@@ -1703,6 +1667,42 @@ static const struct drm_connector_helper_funcs dw_hdmi_connector_helper_funcs = 
	.best_encoder = drm_atomic_helper_best_encoder,

};



static void dw_hdmi_bridge_mode_set(struct drm_bridge *bridge,

				    struct drm_display_mode *orig_mode,

				    struct drm_display_mode *mode)

{

	struct dw_hdmi *hdmi = bridge->driver_private;



	mutex_lock(&hdmi->mutex);



	/* Store the display mode for plugin/DKMS poweron events */

	memcpy(&hdmi->previous_mode, mode, sizeof(hdmi->previous_mode));



	mutex_unlock(&hdmi->mutex);

}



static void dw_hdmi_bridge_disable(struct drm_bridge *bridge)

{

	struct dw_hdmi *hdmi = bridge->driver_private;



	mutex_lock(&hdmi->mutex);

	hdmi->disabled = true;

	dw_hdmi_update_power(hdmi);

	dw_hdmi_update_phy_mask(hdmi);

	mutex_unlock(&hdmi->mutex);

}



static void dw_hdmi_bridge_enable(struct drm_bridge *bridge)

{

	struct dw_hdmi *hdmi = bridge->driver_private;



	mutex_lock(&hdmi->mutex);

	hdmi->disabled = false;

	dw_hdmi_update_power(hdmi);

	dw_hdmi_update_phy_mask(hdmi);

	mutex_unlock(&hdmi->mutex);

}



static const struct drm_bridge_funcs dw_hdmi_bridge_funcs = {

	.enable = dw_hdmi_bridge_enable,

	.disable = dw_hdmi_bridge_disable,