public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 1/2] drm/i915: Don't do edp panel detection in g4x_dp_detect()
Date: Wed, 18 Nov 2015 17:27:44 +0200	[thread overview]
Message-ID: <20151118152744.GL4437@intel.com> (raw)
In-Reply-To: <1447859970-9546-1-git-send-email-ander.conselvan.de.oliveira@intel.com>

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@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>
> ---
>  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@linux.intel.com>


>  	if (!intel_digital_port_connected(dev->dev_private, intel_dig_port))
>  		return connector_status_disconnected;
>  
> -- 
> 2.4.3
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

      parent reply	other threads:[~2015-11-18 15:27 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-18 15:19 [PATCH 1/2] drm/i915: Don't do edp panel detection in g4x_dp_detect() Ander Conselvan de Oliveira
2015-11-18 15:19 ` [PATCH 2/2] drm/i915: Remove platform specific *_dp_detect() functions Ander Conselvan de Oliveira
2015-11-18 15:28   ` Ville Syrjälä
2015-11-18 15:52     ` Ander Conselvan De Oliveira
2015-11-18 15:27 ` Ville Syrjälä [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20151118152744.GL4437@intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=ander.conselvan.de.oliveira@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox