[PATCH v3 07/29] drm/rockchip: inno_hdmi: Get rid of mode_set

[Alex Bee]

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

We're not doing anything special in atomic_mode_set so we can simply
merge it into atomic_enable.

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

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

diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c 
b/drivers/gpu/drm/rockchip/inno_hdmi.c
index 48c4f010b260..299770e481b7 100644
--- a/drivers/gpu/drm/rockchip/inno_hdmi.c
+++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
@@ -490,21 +490,22 @@ static int inno_hdmi_setup(struct inno_hdmi *hdmi,
        return 0;
 }
 
-static void inno_hdmi_encoder_mode_set(struct drm_encoder *encoder,
-                                      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,
                                     struct drm_atomic_state *state)
 {
        struct inno_hdmi *hdmi = encoder_to_inno_hdmi(encoder);
+       struct drm_connector_state *conn_state;
+       struct drm_crtc_state *crtc_state;
+
+       conn_state = drm_atomic_get_new_connector_state(state, 
&hdmi->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;
 
+       inno_hdmi_setup(hdmi, &crtc_state->adjusted_mode);
        inno_hdmi_set_pwr_mode(hdmi, NORMAL);
 }
 
@@ -533,7 +534,6 @@ static struct drm_encoder_helper_funcs 
inno_hdmi_encoder_helper_funcs = {
        .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