[PATCH v4 06/29] drm/rockchip: inno_hdmi: Switch encoder hooks to atomic

[Alex Bee]

From: Maxime Ripard <mrip...@kernel.org>

The inno_hdmi encoder still uses the !atomic variants of enable, disable
and modeset. Convert to their atomic equivalents.

Signed-off-by: Maxime Ripard <mrip...@kernel.org>
Tested-by: Alex Bee <knaerz...@gmail.com>
Signed-off-by: Alex Bee <knaerz...@gmail.com>
---
changes in v2:
 - imported patch

changes in v3:
 - added my SoB

changes in v4:
 - none

 drivers/gpu/drm/rockchip/inno_hdmi.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c 
b/drivers/gpu/drm/rockchip/inno_hdmi.c
index 14d2ba92a606..48c4f010b260 100644
--- a/drivers/gpu/drm/rockchip/inno_hdmi.c
+++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
@@ -491,22 +491,25 @@ static int inno_hdmi_setup(struct inno_hdmi *hdmi,
 }
 
 static void inno_hdmi_encoder_mode_set(struct drm_encoder *encoder,
-                                      struct drm_display_mode *mode,
-                                      struct drm_display_mode *adj_mode)
+                                      struct drm_crtc_state *crtc_state,
+                                      struct drm_connector_state *conn_state)
 {
+       struct drm_display_mode *adj_mode = &crtc_state->adjusted_mode;
        struct inno_hdmi *hdmi = encoder_to_inno_hdmi(encoder);
 
        inno_hdmi_setup(hdmi, adj_mode);
 }
 
-static void inno_hdmi_encoder_enable(struct drm_encoder *encoder)
+static void inno_hdmi_encoder_enable(struct drm_encoder *encoder,
+                                    struct drm_atomic_state *state)
 {
        struct inno_hdmi *hdmi = encoder_to_inno_hdmi(encoder);
 
        inno_hdmi_set_pwr_mode(hdmi, NORMAL);
 }
 
-static void inno_hdmi_encoder_disable(struct drm_encoder *encoder)
+static void inno_hdmi_encoder_disable(struct drm_encoder *encoder,
+                                     struct drm_atomic_state *state)
 {
        struct inno_hdmi *hdmi = encoder_to_inno_hdmi(encoder);
 
@@ -527,10 +530,10 @@ inno_hdmi_encoder_atomic_check(struct drm_encoder 
*encoder,
 }
 
 static struct drm_encoder_helper_funcs inno_hdmi_encoder_helper_funcs = {
-       .enable     = inno_hdmi_encoder_enable,
-       .disable    = inno_hdmi_encoder_disable,
-       .mode_set   = inno_hdmi_encoder_mode_set,
-       .atomic_check = inno_hdmi_encoder_atomic_check,
+       .atomic_check   = inno_hdmi_encoder_atomic_check,
+       .atomic_enable  = inno_hdmi_encoder_enable,
+       .atomic_disable = inno_hdmi_encoder_disable,
+       .atomic_mode_set        = inno_hdmi_encoder_mode_set,
 };
 
 static enum drm_connector_status
-- 
2.43.0