drm/i915/crt: Configure connector->polled and encoder->hpd_pin consistently

Let's make sure encoder->hpd_pin and connector->polled are mirror
images of each other (when we want to use polling). The other
potentially polled connectors (sdvo and tv) already get this right.

Also nuke the redundant force_hotplug_required initialization
(the thing is kzalloc()ed).

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200121171100.4370-4-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
index e47117556ce27c9044f45e672ca42333b180005b..0e2f63b0d45870a375f2d6c2b933141b3d742768 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_crt.c
+++ b/drivers/gpu/drm/i915/display/intel_crt.c
@@ -1033,6 +1033,8 @@ void intel_crt_init(struct drm_i915_private *dev_priv)
            !dmi_check_system(intel_spurious_crt_detect)) {
                crt->base.hpd_pin = HPD_CRT;
                crt->base.hotplug = intel_encoder_hotplug;
+       } else {
+               intel_connector->polled = DRM_CONNECTOR_POLL_CONNECT;
        }
 
        if (HAS_DDI(dev_priv)) {
@@ -1063,14 +1065,6 @@ void intel_crt_init(struct drm_i915_private *dev_priv)
 
        drm_connector_helper_add(connector, &intel_crt_connector_helper_funcs);
 
-       if (!I915_HAS_HOTPLUG(dev_priv))
-               intel_connector->polled = DRM_CONNECTOR_POLL_CONNECT;
-
-       /*
-        * Configure the automatic hotplug detection stuff
-        */
-       crt->force_hotplug_required = false;
-
        /*
         * 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