[PATCH v1 4/7] drm/bridge: lontium-lt9611: Use atomic variants of drm_bridge_funcs

[Sam Ravnborg]

The atomic variants of enable/disable in drm_bridge_funcs are the
preferred operations - introduce these.

Use of mode_set is deprecated - merge the functionality with
atomic_enable()

Signed-off-by: Sam Ravnborg <s...@ravnborg.org>
Cc: Andrzej Hajda <a.ha...@samsung.com>
Cc: Neil Armstrong <narmstr...@baylibre.com>
Cc: Robert Foss <robert.f...@linaro.org>
Cc: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
Cc: Jonas Karlman <jo...@kwiboo.se>
Cc: Jernej Skrabec <jernej.skra...@gmail.com>
---
 drivers/gpu/drm/bridge/lontium-lt9611.c | 69 ++++++++++---------------
 1 file changed, 27 insertions(+), 42 deletions(-)

diff --git a/drivers/gpu/drm/bridge/lontium-lt9611.c 
b/drivers/gpu/drm/bridge/lontium-lt9611.c
index 29b1ce2140ab..dfa7baefe2ab 100644
--- a/drivers/gpu/drm/bridge/lontium-lt9611.c
+++ b/drivers/gpu/drm/bridge/lontium-lt9611.c
@@ -700,9 +700,17 @@ lt9611_connector_mode_valid(struct drm_connector 
*connector,
 }
 
 /* bridge funcs */
-static void lt9611_bridge_enable(struct drm_bridge *bridge)
+static void lt9611_bridge_atomic_enable(struct drm_bridge *bridge,
+                                       struct drm_bridge_state 
*old_bridge_state)
 {
        struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
+       const struct drm_display_mode *mode;
+       const struct drm_crtc_state *crtc_state;
+       struct hdmi_avi_infoframe avi_frame;
+       int ret;
+
+       crtc_state = drm_bridge_new_crtc_state(bridge, old_bridge_state);
+       mode = &crtc_state->mode;
 
        if (lt9611_power_on(lt9611)) {
                dev_err(lt9611->dev, "power on failed\n");
@@ -719,9 +727,21 @@ static void lt9611_bridge_enable(struct drm_bridge *bridge)
 
        /* Enable HDMI output */
        regmap_write(lt9611->regmap, 0x8130, 0xea);
+
+       lt9611_mipi_input_digital(lt9611, mode);
+       lt9611_pll_setup(lt9611, mode);
+       lt9611_mipi_video_setup(lt9611, mode);
+       lt9611_pcr_setup(lt9611, mode);
+
+       ret = drm_hdmi_avi_infoframe_from_display_mode(&avi_frame,
+                                                      &lt9611->connector,
+                                                      mode);
+       if (!ret)
+               lt9611->vic = avi_frame.video_code;
 }
 
-static void lt9611_bridge_disable(struct drm_bridge *bridge)
+static void lt9611_bridge_atomic_disable(struct drm_bridge *bridge,
+                                        struct drm_bridge_state 
*old_bridge_state)
 {
        struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
        int ret;
@@ -877,48 +897,14 @@ 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)
-{
-       struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
-
-       if (!lt9611->sleep)
-               return;
-
-       lt9611_reset(lt9611);
-       regmap_write(lt9611->regmap, 0x80ee, 0x01);
-
-       lt9611->sleep = false;
-}
-
-static void lt9611_bridge_post_disable(struct drm_bridge *bridge)
+static void lt9611_bridge_atomic_post_disable(struct drm_bridge *bridge,
+                                             struct drm_bridge_state 
*old_bridge_state)
 {
        struct lt9611 *lt9611 = bridge_to_lt9611(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;
-       int ret;
-
-       lt9611_bridge_pre_enable(bridge);
-
-       lt9611_mipi_input_digital(lt9611, mode);
-       lt9611_pll_setup(lt9611, mode);
-       lt9611_mipi_video_setup(lt9611, mode);
-       lt9611_pcr_setup(lt9611, mode);
-
-       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)
 {
        struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
@@ -954,10 +940,9 @@ static const struct drm_bridge_funcs lt9611_bridge_funcs = 
{
        .attach = lt9611_bridge_attach,
        .detach = lt9611_bridge_detach,
        .mode_valid = lt9611_bridge_mode_valid,
-       .enable = lt9611_bridge_enable,
-       .disable = lt9611_bridge_disable,
-       .post_disable = lt9611_bridge_post_disable,
-       .mode_set = lt9611_bridge_mode_set,
+       .atomic_enable = lt9611_bridge_atomic_enable,
+       .atomic_disable = lt9611_bridge_atomic_disable,
+       .atomic_post_disable = lt9611_bridge_atomic_post_disable,
        .detect = lt9611_bridge_detect,
        .get_edid = lt9611_bridge_get_edid,
        .hpd_enable = lt9611_bridge_hpd_enable,
-- 
2.30.2