Commit 51676d0e authored Nov 18, 2015 by Ander Conselvan de Oliveira

drm/i915: Don't do edp panel detection in g4x_dp_detect()



That call was moved to intel_dp_detect() in

commit d410b56d
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 2a592bec
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

parent 81e4e0c9

drivers/gpu/drm/i915/intel_dp.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -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;