diff options
| -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)) | 

