1 files changed, 10 insertions, 6 deletions

diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 1ce45a0a2d3e..1d8d63aff444 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -199,10 +199,14 @@ static int intel_crt_mode_valid(struct drm_connector *connector,
         return MODE_OK;
 }
 
-static bool intel_crt_mode_fixup(struct drm_encoder *encoder,
-                                 const struct drm_display_mode *mode,
-                                 struct drm_display_mode *adjusted_mode)
+static bool intel_crt_compute_config(struct intel_encoder *encoder,
+                                     struct intel_crtc_config *pipe_config)
 {
+        struct drm_device *dev = encoder->base.dev;
+
+        if (HAS_PCH_SPLIT(dev))
+                pipe_config->has_pch_encoder = true;
+
         return true;
 }
 
@@ -676,7 +680,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,
         .mode_set = intel_crt_mode_set,
 };
 
@@ -768,8 +771,11 @@ void intel_crt_init(struct drm_device *dev)
         else
                 crt->adpa_reg = ADPA;
 
+        crt->base.compute_config = intel_crt_compute_config;
         crt->base.disable = intel_disable_crt;
         crt->base.enable = intel_enable_crt;
+        if (I915_HAS_HOTPLUG(dev))
+                crt->base.hpd_pin = HPD_CRT;
         if (HAS_DDI(dev))
                 crt->base.get_hw_state = intel_ddi_get_hw_state;
         else
@@ -791,8 +797,6 @@ void intel_crt_init(struct drm_device *dev)
          */
         crt->force_hotplug_required = 0;
 
-        dev_priv->hotplug_supported_mask |= CRT_HOTPLUG_INT_STATUS;
-
         /*
          * TODO: find a proper way to discover whether we need to set the the
          * polarity and link reversal bits or not, instead of relying on the