9 files changed, 0 insertions, 41 deletions

diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 76646c715a42..2e2581098d32 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -617,8 +617,6 @@ static void intel_crt_reset(struct drm_connector *connector)
 
 static const struct drm_encoder_helper_funcs crt_encoder_funcs = {
         .mode_fixup = intel_crt_mode_fixup,
-        .prepare = intel_encoder_noop,
-        .commit = intel_encoder_noop,
         .mode_set = intel_crt_mode_set,
         .disable = intel_encoder_disable,
 };
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 343f99104c39..d37a851d0b2d 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3527,10 +3527,6 @@ static void intel_crtc_disable(struct drm_crtc *crtc)
         }
 }
 
-void intel_encoder_noop(struct drm_encoder *encoder)
-{
-}
-
 void intel_encoder_disable(struct drm_encoder *encoder)
 {
         struct intel_encoder *intel_encoder = to_intel_encoder(encoder);
@@ -6701,16 +6697,6 @@ bool intel_set_mode(struct drm_crtc *crtc,
         }
         DRM_DEBUG_KMS("[CRTC:%d]\n", crtc->base.id);
 
-        /* Prepare the encoders and CRTCs before setting the mode. */
-        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-
-                if (encoder->crtc != crtc)
-                        continue;
-                encoder_funcs = encoder->helper_private;
-                /* Disable the encoders as the first thing we do. */
-                encoder_funcs->prepare(encoder);
-        }
-
         intel_crtc_prepare_encoders(dev);
 
         crtc_funcs->prepare(crtc);
@@ -6737,16 +6723,6 @@ bool intel_set_mode(struct drm_crtc *crtc,
         /* Now enable the clocks, plane, pipe, and connectors that we set up. */
         crtc_funcs->commit(crtc);
 
-        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-
-                if (encoder->crtc != crtc)
-                        continue;
-
-                encoder_funcs = encoder->helper_private;
-                encoder_funcs->commit(encoder);
-
-        }
-
         /* Store real post-adjustment hardware mode. */
         crtc->hwmode = *adjusted_mode;
 
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 2abaaf65ae8d..ff993a01d039 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -2348,9 +2348,7 @@ static void intel_dp_encoder_destroy(struct drm_encoder *encoder)
 
 static const struct drm_encoder_helper_funcs intel_dp_helper_funcs = {
         .mode_fixup = intel_dp_mode_fixup,
-        .prepare = intel_encoder_noop,
         .mode_set = intel_dp_mode_set,
-        .commit = intel_encoder_noop,
         .disable = intel_encoder_disable,
 };
 
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index c28fadae8758..673e8d484bfa 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -414,7 +414,6 @@ extern bool intel_set_mode(struct drm_crtc *crtc, struct drm_display_mode *mode,
                            int x, int y, struct drm_framebuffer *old_fb);
 extern void intel_crtc_load_lut(struct drm_crtc *crtc);
 extern void intel_crtc_update_dpms(struct drm_crtc *crtc);
-extern void intel_encoder_noop(struct drm_encoder *encoder);
 extern void intel_encoder_disable(struct drm_encoder *encoder);
 extern void intel_encoder_destroy(struct drm_encoder *encoder);
 extern void intel_encoder_dpms(struct intel_encoder *encoder, int mode);
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
index c55a13ea7ae8..84c0867e212b 100644
--- a/drivers/gpu/drm/i915/intel_dvo.c
+++ b/drivers/gpu/drm/i915/intel_dvo.c
@@ -318,9 +318,7 @@ static void intel_dvo_destroy(struct drm_connector *connector)
 
 static const struct drm_encoder_helper_funcs intel_dvo_helper_funcs = {
         .mode_fixup = intel_dvo_mode_fixup,
-        .prepare = intel_encoder_noop,
         .mode_set = intel_dvo_mode_set,
-        .commit = intel_encoder_noop,
         .disable = intel_encoder_disable,
 };
 
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index ef8409794ab6..c9535cee1a73 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -885,17 +885,13 @@ static void intel_hdmi_destroy(struct drm_connector *connector)
 
 static const struct drm_encoder_helper_funcs intel_hdmi_helper_funcs_hsw = {
         .mode_fixup = intel_hdmi_mode_fixup,
-        .prepare = intel_encoder_noop,
         .mode_set = intel_ddi_mode_set,
-        .commit = intel_encoder_noop,
         .disable = intel_encoder_disable,
 };
 
 static const struct drm_encoder_helper_funcs intel_hdmi_helper_funcs = {
         .mode_fixup = intel_hdmi_mode_fixup,
-        .prepare = intel_encoder_noop,
         .mode_set = intel_hdmi_mode_set,
-        .commit = intel_encoder_noop,
         .disable = intel_encoder_disable,
 };
 
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index fad82b2721ed..5fc7abca28ee 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -570,9 +570,7 @@ static int intel_lvds_set_property(struct drm_connector *connector,
 
 static const struct drm_encoder_helper_funcs intel_lvds_helper_funcs = {
         .mode_fixup = intel_lvds_mode_fixup,
-        .prepare = intel_encoder_noop,
         .mode_set = intel_lvds_mode_set,
-        .commit = intel_encoder_noop,
         .disable = intel_encoder_disable,
 };
 
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 88fb30dff758..8cdc674ff4b7 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1889,9 +1889,7 @@ done:
 
 static const struct drm_encoder_helper_funcs intel_sdvo_helper_funcs = {
         .mode_fixup = intel_sdvo_mode_fixup,
-        .prepare = intel_encoder_noop,
         .mode_set = intel_sdvo_mode_set,
-        .commit = intel_encoder_noop,
         .disable = intel_encoder_disable
 };
 
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index 16cb11405068..5dc08b931ff9 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -1479,9 +1479,7 @@ out:
 
 static const struct drm_encoder_helper_funcs intel_tv_helper_funcs = {
         .mode_fixup = intel_tv_mode_fixup,
-        .prepare = intel_encoder_noop,
         .mode_set = intel_tv_mode_set,
-        .commit = intel_encoder_noop,
         .disable = intel_encoder_disable,
 };