[PATCH v5 5/9] drm/msm/hdmi: turn mode_set into atomic_enable

[Dmitry Baryshkov]

The mode_set callback is deprecated, it doesn't get the
drm_bridge_state, just mode-related argumetns. Turn it into the
atomic_enable callback as suggested by the documentation.

Acked-by: Maxime Ripard <mrip...@kernel.org>
Signed-off-by: Dmitry Baryshkov <dmitry.barysh...@linaro.org>
---
 drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c 
b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
index d839c71091dc..f259d6268c0f 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
@@ -129,12 +129,25 @@ static void msm_hdmi_config_avi_infoframe(struct hdmi 
*hdmi)
 static void msm_hdmi_bridge_atomic_pre_enable(struct drm_bridge *bridge,
                                              struct drm_bridge_state 
*old_bridge_state)
 {
+       struct drm_atomic_state *state = old_bridge_state->base.state;
        struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge);
        struct hdmi *hdmi = hdmi_bridge->hdmi;
        struct hdmi_phy *phy = hdmi->phy;
+       struct drm_encoder *encoder = bridge->encoder;
+       struct drm_connector *connector;
+       struct drm_connector_state *conn_state;
+       struct drm_crtc_state *crtc_state;
+       const struct drm_display_mode *mode;
 
        DBG("power up");
 
+       connector = drm_atomic_get_new_connector_for_encoder(state, encoder);
+       conn_state = drm_atomic_get_new_connector_state(state, connector);
+       crtc_state = drm_atomic_get_new_crtc_state(state, conn_state->crtc);
+       mode = &crtc_state->adjusted_mode;
+
+       hdmi->pixclock = mode->clock * 1000;
+
        if (!hdmi->power_on) {
                msm_hdmi_phy_resource_enable(phy);
                msm_hdmi_power_on(bridge);
@@ -177,18 +190,24 @@ static void msm_hdmi_bridge_atomic_post_disable(struct 
drm_bridge *bridge,
        }
 }
 
-static void msm_hdmi_bridge_mode_set(struct drm_bridge *bridge,
-                const struct drm_display_mode *mode,
-                const struct drm_display_mode *adjusted_mode)
+static void msm_hdmi_bridge_atomic_enable(struct drm_bridge *bridge,
+                                         struct drm_bridge_state 
*old_bridge_state)
 {
+       struct drm_atomic_state *state = old_bridge_state->base.state;
        struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge);
        struct hdmi *hdmi = hdmi_bridge->hdmi;
+       struct drm_encoder *encoder = bridge->encoder;
+       struct drm_connector *connector;
+       struct drm_connector_state *conn_state;
+       struct drm_crtc_state *crtc_state;
+       const struct drm_display_mode *mode;
        int hstart, hend, vstart, vend;
        uint32_t frame_ctrl;
 
-       mode = adjusted_mode;
-
-       hdmi->pixclock = mode->clock * 1000;
+       connector = drm_atomic_get_new_connector_for_encoder(state, encoder);
+       conn_state = drm_atomic_get_new_connector_state(state, connector);
+       crtc_state = drm_atomic_get_new_crtc_state(state, conn_state->crtc);
+       mode = &crtc_state->adjusted_mode;
 
        hstart = mode->htotal - mode->hsync_start;
        hend   = mode->htotal - mode->hsync_start + mode->hdisplay;
@@ -305,8 +324,8 @@ static const struct drm_bridge_funcs msm_hdmi_bridge_funcs 
= {
        .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
        .atomic_reset = drm_atomic_helper_bridge_reset,
        .atomic_pre_enable = msm_hdmi_bridge_atomic_pre_enable,
+       .atomic_enable = msm_hdmi_bridge_atomic_enable,
        .atomic_post_disable = msm_hdmi_bridge_atomic_post_disable,
-       .mode_set = msm_hdmi_bridge_mode_set,
        .mode_valid = msm_hdmi_bridge_mode_valid,
        .edid_read = msm_hdmi_bridge_edid_read,
        .detect = msm_hdmi_bridge_detect,

-- 
2.39.2