From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH v2 5/7] drm/i915: stop using is_pch_edp() in is_cpu_edp() Date: Fri, 10 May 2013 10:49:12 +0200 Message-ID: <20130510084912.GF12292@phenom.ffwll.local> References: <1367940253-10329-1-git-send-email-imre.deak@intel.com> <1368008048-19164-1-git-send-email-imre.deak@intel.com> <1368008048-19164-6-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ee0-f52.google.com (mail-ee0-f52.google.com [74.125.83.52]) by gabe.freedesktop.org (Postfix) with ESMTP id 3C517E5DAF for ; Fri, 10 May 2013 01:46:06 -0700 (PDT) Received: by mail-ee0-f52.google.com with SMTP id d41so2056118eek.11 for ; Fri, 10 May 2013 01:46:05 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1368008048-19164-6-git-send-email-imre.deak@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Imre Deak Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Wed, May 08, 2013 at 01:14:06PM +0300, Imre Deak wrote: > is_pch_edp() will be removed by the next patch, so replace it by a check > for the port and device type. > > Signed-off-by: Imre Deak > --- > drivers/gpu/drm/i915/intel_dp.c | 17 +++++++++++------ > 1 file changed, 11 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index 42c11dd..38b9cd2 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -65,6 +65,13 @@ static bool is_pch_edp(struct intel_dp *intel_dp) > return intel_dp->is_pch_edp; > } > > +static struct drm_device *intel_dp_to_dev(struct intel_dp *intel_dp) > +{ > + struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); > + > + return intel_dig_port->base.base.dev; > +} > + > /** > * is_cpu_edp - is the port on the CPU and attached to an eDP panel? > * @intel_dp: DP struct > @@ -73,14 +80,12 @@ static bool is_pch_edp(struct intel_dp *intel_dp) > */ > static bool is_cpu_edp(struct intel_dp *intel_dp) > { > - return is_edp(intel_dp) && !is_pch_edp(intel_dp); > -} > - > -static struct drm_device *intel_dp_to_dev(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); > + enum port port = intel_dig_port->port; > > - return intel_dig_port->base.base.dev; > + return is_edp(intel_dp) && > + (port == PORT_A || (port == PORT_C && IS_VALLEYVIEW(dev))); Valleyview is a giant mess here, I guess we should split the vlv case from the pch_split cpu edp case. Maybe just check for port A in relevant cases and factor out vlv cases completely. My bet is that this massive confusion is the reason that vlv dp (i.e. non-edp) is totally broken atm. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch