drm: Remove bridge support from legacy helpers

DRM bridges are only used by atomic drivers, and none of them use the
legacy helpers. Drop bridge support from those helpers to prepare for
making the bridge operations atomic-aware.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index 6dd49a60deacdd88a0205b4e23d563e7ec90754f..80ddf13ad99612056ca44bd49e2669d201920399 100644 (file)
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -159,14 +159,10 @@ drm_encoder_disable(struct drm_encoder *encoder)
        if (!encoder_funcs)
                return;
 
-       drm_bridge_disable(encoder->bridge);
-
        if (encoder_funcs->disable)
                (*encoder_funcs->disable)(encoder);
        else if (encoder_funcs->dpms)
                (*encoder_funcs->dpms)(encoder, DRM_MODE_DPMS_OFF);
-
-       drm_bridge_post_disable(encoder->bridge);
 }
 
 static void __drm_helper_disable_unused_functions(struct drm_device *dev)
@@ -326,13 +322,6 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
                if (!encoder_funcs)
                        continue;
 
-               ret = drm_bridge_mode_fixup(encoder->bridge,
-                       mode, adjusted_mode);
-               if (!ret) {
-                       DRM_DEBUG_KMS("Bridge fixup failed\n");
-                       goto done;
-               }
-
                encoder_funcs = encoder->helper_private;
                if (encoder_funcs->mode_fixup) {
                        if (!(ret = encoder_funcs->mode_fixup(encoder, mode,
@@ -364,13 +353,9 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
                if (!encoder_funcs)
                        continue;
 
-               drm_bridge_disable(encoder->bridge);
-
                /* Disable the encoders as the first thing we do. */
                if (encoder_funcs->prepare)
                        encoder_funcs->prepare(encoder);
-
-               drm_bridge_post_disable(encoder->bridge);
        }
 
        drm_crtc_prepare_encoders(dev);
@@ -397,8 +382,6 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
                        encoder->base.id, encoder->name, mode->name);
                if (encoder_funcs->mode_set)
                        encoder_funcs->mode_set(encoder, mode, adjusted_mode);
-
-               drm_bridge_mode_set(encoder->bridge, mode, adjusted_mode);
        }
 
        /* Now enable the clocks, plane, pipe, and connectors that we set up. */
@@ -413,12 +396,8 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
                if (!encoder_funcs)
                        continue;
 
-               drm_bridge_pre_enable(encoder->bridge);
-
                if (encoder_funcs->commit)
                        encoder_funcs->commit(encoder);
-
-               drm_bridge_enable(encoder->bridge);
        }
 
        /* Calculate and store various constants which
@@ -817,25 +796,14 @@ static int drm_helper_choose_encoder_dpms(struct drm_encoder *encoder)
 /* Helper which handles bridge ordering around encoder dpms */
 static void drm_helper_encoder_dpms(struct drm_encoder *encoder, int mode)
 {
-       struct drm_bridge *bridge = encoder->bridge;
        const struct drm_encoder_helper_funcs *encoder_funcs;
 
        encoder_funcs = encoder->helper_private;
        if (!encoder_funcs)
                return;
 
-       if (mode == DRM_MODE_DPMS_ON)
-               drm_bridge_pre_enable(bridge);
-       else
-               drm_bridge_disable(bridge);
-
        if (encoder_funcs->dpms)
                encoder_funcs->dpms(encoder, mode);
-
-       if (mode == DRM_MODE_DPMS_ON)
-               drm_bridge_enable(bridge);
-       else
-               drm_bridge_post_disable(bridge);
 }
 
 static int drm_helper_choose_crtc_dpms(struct drm_crtc *crtc)