drm/bridge: lt9611: rework the mode_set function

The mode_set callback is deprectated for drm_bridges in favour of using
atomic_enable callback. Move corresponding code into the function
lt9611_bridge_atomic_enable() and turn lt9611_bridge_pre_enable() into
the proper atomic_pre_enable callback.

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230118081658.2198520-8-dmitry.baryshkov@linaro.org

diff --git a/drivers/gpu/drm/bridge/lontium-lt9611.c b/drivers/gpu/drm/bridge/lontium-lt9611.c
index dd1ae8d..c45f566 100644 (file)
--- a/drivers/gpu/drm/bridge/lontium-lt9611.c
+++ b/drivers/gpu/drm/bridge/lontium-lt9611.c
@@ -714,6 +714,39 @@ lt9611_bridge_atomic_enable(struct drm_bridge *bridge,
                            struct drm_bridge_state *old_bridge_state)
 {
        struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
+       struct drm_atomic_state *state = old_bridge_state->base.state;
+       struct drm_connector *connector;
+       struct drm_connector_state *conn_state;
+       struct drm_crtc_state *crtc_state;
+       struct drm_display_mode *mode;
+       struct hdmi_avi_infoframe avi_frame;
+       unsigned int postdiv;
+       int ret;
+
+       connector = drm_atomic_get_new_connector_for_encoder(state, bridge->encoder);
+       if (WARN_ON(!connector))
+               return;
+
+       conn_state = drm_atomic_get_new_connector_state(state, connector);
+       if (WARN_ON(!conn_state))
+               return;
+
+       crtc_state = drm_atomic_get_new_crtc_state(state, conn_state->crtc);
+       if (WARN_ON(!crtc_state))
+               return;
+
+       mode = &crtc_state->adjusted_mode;
+
+       lt9611_mipi_input_digital(lt9611, mode);
+       lt9611_pll_setup(lt9611, mode, &postdiv);
+       lt9611_mipi_video_setup(lt9611, mode);
+       lt9611_pcr_setup(lt9611, mode, postdiv);
+
+       ret = drm_hdmi_avi_infoframe_from_display_mode(&avi_frame,
+                                                      connector,
+                                                      mode);
+       if (!ret)
+               lt9611->vic = avi_frame.video_code;
 
        if (lt9611_power_on(lt9611)) {
                dev_err(lt9611->dev, "power on failed\n");
@@ -857,7 +890,8 @@ static enum drm_mode_status lt9611_bridge_mode_valid(struct drm_bridge *bridge,
                return MODE_OK;
 }
 
-static void lt9611_bridge_pre_enable(struct drm_bridge *bridge)
+static void lt9611_bridge_atomic_pre_enable(struct drm_bridge *bridge,
+                                           struct drm_bridge_state *old_bridge_state)
 {
        struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
        static const struct reg_sequence reg_cfg[] = {
@@ -885,29 +919,6 @@ lt9611_bridge_atomic_post_disable(struct drm_bridge *bridge,
        lt9611_sleep_setup(lt9611);
 }
 
-static void lt9611_bridge_mode_set(struct drm_bridge *bridge,
-                                  const struct drm_display_mode *mode,
-                                  const struct drm_display_mode *adj_mode)
-{
-       struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
-       struct hdmi_avi_infoframe avi_frame;
-       unsigned int postdiv;
-       int ret;
-
-       lt9611_bridge_pre_enable(bridge);
-
-       lt9611_mipi_input_digital(lt9611, mode);
-       lt9611_pll_setup(lt9611, mode, &postdiv);
-       lt9611_mipi_video_setup(lt9611, mode);
-       lt9611_pcr_setup(lt9611, mode, postdiv);
-
-       ret = drm_hdmi_avi_infoframe_from_display_mode(&avi_frame,
-                                                      &lt9611->connector,
-                                                      mode);
-       if (!ret)
-               lt9611->vic = avi_frame.video_code;
-}
-
 static enum drm_connector_status lt9611_bridge_detect(struct drm_bridge *bridge)
 {
        return __lt9611_detect(bridge_to_lt9611(bridge));
@@ -958,11 +969,11 @@ lt9611_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
 static const struct drm_bridge_funcs lt9611_bridge_funcs = {
        .attach = lt9611_bridge_attach,
        .mode_valid = lt9611_bridge_mode_valid,
-       .mode_set = lt9611_bridge_mode_set,
        .detect = lt9611_bridge_detect,
        .get_edid = lt9611_bridge_get_edid,
        .hpd_enable = lt9611_bridge_hpd_enable,
 
+       .atomic_pre_enable = lt9611_bridge_atomic_pre_enable,
        .atomic_enable = lt9611_bridge_atomic_enable,
        .atomic_disable = lt9611_bridge_atomic_disable,
        .atomic_post_disable = lt9611_bridge_atomic_post_disable,