On Wed, Nov 18, 2015 at 05:19:29PM +0200, Ander Conselvan de Oliveira wrote:
> That call was moved to intel_dp_detect() in
>
> commit d410b56d74bc706f414158cb0149e2a149ee1650
> Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
> 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@xxxxxxxxxx>
> 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@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_dp.c | 10 ----------
> 1 file changed, 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 72d099d..2b28762 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -4553,16 +4553,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;
> - }
> -
Yup, dead code now.
Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> if (!intel_digital_port_connected(dev->dev_private, intel_dig_port))
> return connector_status_disconnected;
>
> --
> 2.4.3
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
