]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/i915: Assume eDP is always connected
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Tue, 17 Jul 2018 17:42:15 +0000 (20:42 +0300)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 19 Jul 2018 15:39:31 +0000 (18:39 +0300)
We never registered any kind of lid notifier for eDP, so looking at the
lid status is pretty much bonkers. Let's just consider eDP always
connected instead.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180717174216.22252-2-ville.syrjala@linux.intel.com
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/intel_dp.c

index 5899cadf11e30c419d003df0843c6170a77a8e24..fee23cf93a2b65f1da2af7114b0c62b2ae0e5397 100644 (file)
@@ -4406,14 +4406,7 @@ intel_dp_detect_dpcd(struct intel_dp *intel_dp)
 static enum drm_connector_status
 edp_detect(struct intel_dp *intel_dp)
 {
-       struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
-       enum drm_connector_status status;
-
-       status = intel_panel_detect(dev_priv);
-       if (status == connector_status_unknown)
-               status = connector_status_connected;
-
-       return status;
+       return connector_status_connected;
 }
 
 static bool ibx_digital_port_connected(struct intel_encoder *encoder)
@@ -4674,7 +4667,7 @@ intel_dp_long_pulse(struct intel_connector *connector)
 
        intel_display_power_get(dev_priv, intel_dp->aux_power_domain);
 
-       /* Can't disconnect eDP, but you can close the lid... */
+       /* Can't disconnect eDP */
        if (intel_dp_is_edp(intel_dp))
                status = edp_detect(intel_dp);
        else if (intel_digital_port_connected(&dp_to_dig_port(intel_dp)->base))