]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/sun4i: rgb: Remove the bridge enable/disable functions
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Thu, 29 Sep 2016 12:05:05 +0000 (14:05 +0200)
committerMaxime Ripard <maxime.ripard@free-electrons.com>
Sun, 16 Oct 2016 12:32:23 +0000 (14:32 +0200)
The atomic helpers already call the drm_bridge_enable on our behalf,
there's no need to do it a second time.

Reported-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
drivers/gpu/drm/sun4i/sun4i_rgb.c

index 4e4bea6f395cfcb748748c0d1c5acb98780724ed..d198ad7e53234794b0e78933ff395b38b90cfd59 100644 (file)
@@ -155,9 +155,6 @@ static void sun4i_rgb_encoder_enable(struct drm_encoder *encoder)
        if (!IS_ERR(tcon->panel))
                drm_panel_prepare(tcon->panel);
 
-       /* encoder->bridge can be NULL; drm_bridge_enable checks for it */
-       drm_bridge_enable(encoder->bridge);
-
        sun4i_tcon_channel_enable(tcon, 0);
 
        if (!IS_ERR(tcon->panel))
@@ -177,9 +174,6 @@ static void sun4i_rgb_encoder_disable(struct drm_encoder *encoder)
 
        sun4i_tcon_channel_disable(tcon, 0);
 
-       /* encoder->bridge can be NULL; drm_bridge_disable checks for it */
-       drm_bridge_disable(encoder->bridge);
-
        if (!IS_ERR(tcon->panel))
                drm_panel_unprepare(tcon->panel);
 }