From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH] drm/i915: fix up the edp power well check Date: Wed, 29 May 2013 19:56:11 +0200 Message-ID: <1369850171-16754-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-ea0-f170.google.com (mail-ea0-f170.google.com [209.85.215.170]) by gabe.freedesktop.org (Postfix) with ESMTP id 0D853E639C for ; Wed, 29 May 2013 10:56:18 -0700 (PDT) Received: by mail-ea0-f170.google.com with SMTP id f15so5645564eak.29 for ; Wed, 29 May 2013 10:56:17 -0700 (PDT) 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: Intel Graphics Development Cc: Takashi Iwai , Daniel Vetter , Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org 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 Cc: Takashi Iwai Cc: Paulo Zanoni Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 3db4ed2..1ee9e92 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5809,12 +5809,8 @@ static void haswell_modeset_global_resources(struct drm_device *dev) /* Even the eDP panel fitter is outside the always-on well. */ if (crtc->config.pch_pfit.size && crtc->base.enabled) enable = true; - } - list_for_each_entry(encoder, &dev->mode_config.encoder_list, - base.head) { - if (encoder->type != INTEL_OUTPUT_EDP && - encoder->connectors_active) + if (crtc->config.cpu_transcoder != TRANSCODER_EDP) enable = true; } -- 1.7.10.4