From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: Re: [PATCH] drm/i915: fix up the edp power well check Date: Fri, 31 May 2013 14:24:11 -0300 Message-ID: References: <1370015357-8204-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ob0-f171.google.com (mail-ob0-f171.google.com [209.85.214.171]) by gabe.freedesktop.org (Postfix) with ESMTP id 5A1A7E6278 for ; Fri, 31 May 2013 10:24:12 -0700 (PDT) Received: by mail-ob0-f171.google.com with SMTP id dn14so3531934obc.16 for ; Fri, 31 May 2013 10:24:12 -0700 (PDT) In-Reply-To: <1370015357-8204-1-git-send-email-daniel.vetter@ffwll.ch> 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: Daniel Vetter Cc: Takashi Iwai , Intel Graphics Development , Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org 2013/5/31 Daniel Vetter : > Now that we track the cpu transcoder we need accurately in the pipe > config we can finally fix up the transcoder check. With the current > code eDP on port D will be broken since we'd errornously cut the > power. > > For reference see > > commit 2124b72e6283c4e84a55e71077fee91793f4c801 > Author: Paulo Zanoni > Date: Fri Mar 22 14:07:23 2013 -0300 > > drm/i915: don't disable the power well yet > > v2: > - Kill the now outdated comment (Paulo) > - Add the missing crtc->base.enabled check and consolidate it (Paulo) > - Smash all checks together, looks neater that way. > > v3: Kill the unused encoder variable. > > Cc: Takashi Iwai > Cc: Paulo Zanoni > Signed-off-by: Daniel Vetter Reviewed-by: Paulo Zanoni > --- > drivers/gpu/drm/i915/intel_display.c | 18 ++++-------------- > 1 file changed, 4 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 3db4ed2..c4adbfe 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -5798,23 +5798,13 @@ static void haswell_modeset_global_resources(struct drm_device *dev) > { > bool enable = false; > struct intel_crtc *crtc; > - struct intel_encoder *encoder; > > list_for_each_entry(crtc, &dev->mode_config.crtc_list, base.head) { > - if (crtc->pipe != PIPE_A && crtc->base.enabled) > - enable = true; > - /* XXX: Should check for edp transcoder here, but thanks to init > - * sequence that's not yet available. Just in case desktop eDP > - * on PORT D is possible on haswell, too. */ > - /* Even the eDP panel fitter is outside the always-on well. */ > - if (crtc->config.pch_pfit.size && crtc->base.enabled) > - enable = true; > - } > + if (!crtc->base.enabled) > + continue; > > - list_for_each_entry(encoder, &dev->mode_config.encoder_list, > - base.head) { > - if (encoder->type != INTEL_OUTPUT_EDP && > - encoder->connectors_active) > + if (crtc->pipe != PIPE_A || crtc->config.pch_pfit.size || > + crtc->config.cpu_transcoder != TRANSCODER_EDP) > enable = true; > } > > -- > 1.7.10.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Paulo Zanoni