1 files changed, 15 insertions, 30 deletions

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index f9f2f7df6ee3..34ac746334b3 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -685,7 +685,7 @@ intel_dp_i2c_init(struct intel_dp *intel_dp,
         return ret;
 }
 
-static bool
+bool
 intel_dp_mode_fixup(struct drm_encoder *encoder,
                     const struct drm_display_mode *mode,
                     struct drm_display_mode *adjusted_mode)
@@ -2110,7 +2110,7 @@ intel_dp_handle_test_request(struct intel_dp *intel_dp)
  *  4. Check link status on receipt of hot-plug interrupt
  */
 
-static void
+void
 intel_dp_check_link_status(struct intel_dp *intel_dp)
 {
         struct intel_encoder *intel_encoder = &dp_to_dig_port(intel_dp)->base;
@@ -2469,7 +2469,7 @@ intel_dp_destroy(struct drm_connector *connector)
         kfree(connector);
 }
 
-static void intel_dp_encoder_destroy(struct drm_encoder *encoder)
+void intel_dp_encoder_destroy(struct drm_encoder *encoder)
 {
         struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
         struct intel_dp *intel_dp = &intel_dig_port->dp;
@@ -2489,12 +2489,6 @@ static const struct drm_encoder_helper_funcs intel_dp_helper_funcs = {
         .disable = intel_encoder_noop,
 };
 
-static const struct drm_encoder_helper_funcs intel_dp_helper_funcs_hsw = {
-        .mode_fixup = intel_dp_mode_fixup,
-        .mode_set = intel_ddi_mode_set,
-        .disable = intel_encoder_noop,
-};
-
 static const struct drm_connector_funcs intel_dp_connector_funcs = {
         .dpms = intel_connector_dpms,
         .detect = intel_dp_detect,
@@ -2690,7 +2684,7 @@ intel_dp_init_panel_power_sequencer(struct drm_device *dev,
                       I915_READ(PCH_PP_DIVISOR));
 }
 
-static void
+void
 intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
                         struct intel_connector *intel_connector)
 {
@@ -2723,8 +2717,11 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
                 type = DRM_MODE_CONNECTOR_eDP;
                 intel_encoder->type = INTEL_OUTPUT_EDP;
         } else {
+                /* The intel_encoder->type value may be INTEL_OUTPUT_UNKNOWN for
+                 * DDI or INTEL_OUTPUT_DISPLAYPORT for the older gens, so don't
+                 * rewrite it.
+                 */
                 type = DRM_MODE_CONNECTOR_DisplayPort;
-                intel_encoder->type = INTEL_OUTPUT_DISPLAYPORT;
         }
 
         drm_connector_init(dev, connector, &intel_dp_connector_funcs, type);
@@ -2869,30 +2866,18 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port)
 
         drm_encoder_init(dev, &intel_encoder->base, &intel_dp_enc_funcs,
                          DRM_MODE_ENCODER_TMDS);
+        drm_encoder_helper_add(&intel_encoder->base, &intel_dp_helper_funcs);
 
-        if (IS_HASWELL(dev)) {
-                drm_encoder_helper_add(&intel_encoder->base,
-                                       &intel_dp_helper_funcs_hsw);
-
-                intel_encoder->enable = intel_enable_ddi;
-                intel_encoder->pre_enable = intel_ddi_pre_enable;
-                intel_encoder->disable = intel_disable_ddi;
-                intel_encoder->post_disable = intel_ddi_post_disable;
-                intel_encoder->get_hw_state = intel_ddi_get_hw_state;
-        } else {
-                drm_encoder_helper_add(&intel_encoder->base,
-                                       &intel_dp_helper_funcs);
-
-                intel_encoder->enable = intel_enable_dp;
-                intel_encoder->pre_enable = intel_pre_enable_dp;
-                intel_encoder->disable = intel_disable_dp;
-                intel_encoder->post_disable = intel_post_disable_dp;
-                intel_encoder->get_hw_state = intel_dp_get_hw_state;
-        }
+        intel_encoder->enable = intel_enable_dp;
+        intel_encoder->pre_enable = intel_pre_enable_dp;
+        intel_encoder->disable = intel_disable_dp;
+        intel_encoder->post_disable = intel_post_disable_dp;
+        intel_encoder->get_hw_state = intel_dp_get_hw_state;
 
         intel_dig_port->port = port;
         intel_dig_port->dp.output_reg = output_reg;
 
+        intel_encoder->type = INTEL_OUTPUT_DISPLAYPORT;
         intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);
         intel_encoder->cloneable = false;
         intel_encoder->hot_plug = intel_dp_hot_plug;