diff options
| author | Ander Conselvan de Oliveira | 2015-11-18 16:19:29 +0100 |
|---|---|---|
| committer | Ander Conselvan de Oliveira | 2015-11-18 16:47:03 +0100 |
| commit | 51676d0e303c8d7c153ad702fd91f83374bc43e4 (patch) | |
| tree | 3f408cc8fb7db3a637959354426946a4c227650f /drivers/gpu/drm/i915/intel_dp.c | |
| parent | drm/i915: Send TP1 TP2/3 even when panel claims no NO_TRAIN_ON_EXIT. (diff) | |
| download | kernel-qcow2-linux-51676d0e303c8d7c153ad702fd91f83374bc43e4.tar.gz kernel-qcow2-linux-51676d0e303c8d7c153ad702fd91f83374bc43e4.tar.xz kernel-qcow2-linux-51676d0e303c8d7c153ad702fd91f83374bc43e4.zip | |
drm/i915: Don't do edp panel detection in g4x_dp_detect()
That call was moved to intel_dp_detect() in
commit d410b56d74bc706f414158cb0149e2a149ee1650
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue Sep 2 20:03:59 2014 +0100
drm/i915/dp: Refactor common eDP lid detection
but it seem to have been resurrected in the following commit, probably
due to a wrong merge conflict resolution.
commit 2a592bec50994597716c633191ed6bf7af14defc
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Sep 1 16:58:12 2014 +1000
drm/i915: handle G45/GM45 pulse detection connected state.
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1447859970-9546-1-git-send-email-ander.conselvan.de.oliveira@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index c26aea86d3ec..15d625cc5f3d 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -4552,16 +4552,6 @@ g4x_dp_detect(struct intel_dp *intel_dp) struct drm_device *dev = intel_dp_to_dev(intel_dp); struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); - /* Can't disconnect eDP, but you can close the lid... */ - if (is_edp(intel_dp)) { - enum drm_connector_status status; - - status = intel_panel_detect(dev); - if (status == connector_status_unknown) - status = connector_status_connected; - return status; - } - if (!intel_digital_port_connected(dev->dev_private, intel_dig_port)) return connector_status_disconnected; |