From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 1/4] drm/i915: stop using is_cpu_edp() in intel_disable/post_disable_dp Date: Tue, 21 May 2013 11:15:17 +0200 Message-ID: <20130521091517.GH12292@phenom.ffwll.local> References: <1368704437-17034-1-git-send-email-imre.deak@intel.com> <1368704437-17034-2-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-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 20875E5CF4 for ; Tue, 21 May 2013 02:15:21 -0700 (PDT) Received: by mail-we0-f177.google.com with SMTP id n57so210970wev.22 for ; Tue, 21 May 2013 02:15:21 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1368704437-17034-2-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 Thu, May 16, 2013 at 02:40:34PM +0300, Imre Deak wrote: > On port A and for Valleyview on port C we can have only eDP and in both > cases it's a CPU port. So we can replace is_cpu_edp() with a port check > for these two cases. This allows us to remove is_cpu_edp() completely in > a later patch. > > Signed-off-by: Imre Deak > --- > drivers/gpu/drm/i915/intel_dp.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index 4dae01a..90ae58a 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -1350,6 +1350,8 @@ static bool intel_dp_get_hw_state(struct intel_encoder *encoder, > static void intel_disable_dp(struct intel_encoder *encoder) > { > struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base); > + enum port port = dp_to_dig_port(intel_dp)->port; > + struct drm_device *dev = encoder->base.dev; > > /* Make sure the panel is off before trying to change the mode. But also > * ensure that we have vdd while we switch off the panel. */ > @@ -1359,16 +1361,17 @@ static void intel_disable_dp(struct intel_encoder *encoder) > ironlake_edp_panel_off(intel_dp); > > /* cpu edp my only be disable _after_ the cpu pipe/plane is disabled. */ > - if (!is_cpu_edp(intel_dp)) > + if (port != PORT_A && (port != PORT_C || !IS_VALLEYVIEW(dev))) I think this would read easier as port !(port == A || IS_VLV). I think that should also be more correct since there's no reason (besides hard-coding) that DP on port B (or external DP fwiw) should work different on vlv. -Daniel > intel_dp_link_down(intel_dp); > } > > static void intel_post_disable_dp(struct intel_encoder *encoder) > { > struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base); > + enum port port = dp_to_dig_port(intel_dp)->port; > struct drm_device *dev = encoder->base.dev; > > - if (is_cpu_edp(intel_dp)) { > + if (port == PORT_A || (port == PORT_C && IS_VALLEYVIEW(dev))) { > intel_dp_link_down(intel_dp); > if (!IS_VALLEYVIEW(dev)) > ironlake_edp_pll_off(intel_dp); > -- > 1.7.10.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch