| From 8ec211dda8911fe23ee4c7e4f6e86e5021819d76 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Tue, 17 Jan 2017 10:28:58 +0200 |
| Subject: [PATCH 243/255] 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: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Reviewed-by: Jose Abreu <joabreu@synopsys.com> |
| Signed-off-by: Archit Taneja <architt@codeaurora.org> |
| Link: http://patchwork.freedesktop.org/patch/msgid/20170117082910.27023-9-laurent.pinchart+renesas@ideasonboard.com |
| (cherry picked from commit fd30b38c27c305fcb522bfa7911de241ee1799b5) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/gpu/drm/bridge/dw-hdmi.c | 72 +++++++++++++++++++-------------------- |
| 1 file changed, 36 insertions(+), 36 deletions(-) |
| |
| --- a/drivers/gpu/drm/bridge/dw-hdmi.c |
| +++ b/drivers/gpu/drm/bridge/dw-hdmi.c |
| @@ -1575,42 +1575,6 @@ static void dw_hdmi_update_phy_mask(stru |
| 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 |
| .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, |