diff options
| author | Ville Syrjälä | 2018-07-17 19:42:15 +0200 |
|---|---|---|
| committer | Ville Syrjälä | 2018-07-19 17:39:31 +0200 |
| commit | b93b41afcee272c13f4aa9df18b46ba40cce37e5 (patch) | |
| tree | 3b92eac8559fbc919c89d83a726033e28c5a6fd1 /drivers/gpu/drm/i915 | |
| parent | drm/i915: Nuke the LVDS lid notifier (diff) | |
| download | kernel-qcow2-linux-b93b41afcee272c13f4aa9df18b46ba40cce37e5.tar.gz kernel-qcow2-linux-b93b41afcee272c13f4aa9df18b46ba40cce37e5.tar.xz kernel-qcow2-linux-b93b41afcee272c13f4aa9df18b46ba40cce37e5.zip | |
drm/i915: Assume eDP is always connected
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>
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 5899cadf11e3..fee23cf93a2b 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -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)) |