From patchwork Wed May 29 17:56:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2632041 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id B136D40077 for ; Wed, 29 May 2013 17:57:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A1957E6468 for ; Wed, 29 May 2013 10:57:00 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer; bh=s9TxuHu67+DPS0RmTE0GCxWD2b2HeUi7mTpW/Stpw90=; b=MxdXWyeyfRPmQYNNhuMAIpUg1VMD1i8TrB2YLL5n/sgc3lpqRoO9qKptf9nCC/YFxa u1JUn13oGg96Mem1vI518olT+d7qPYmRdQImfXArcL/aXC/4mbndLUTZSeV+0BgAVd13 YKN6wTI92xSIWQL5zkXuPiORUGF4dEb8S+q0o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=s9TxuHu67+DPS0RmTE0GCxWD2b2HeUi7mTpW/Stpw90=; b=jZ0H2JNlQXup6a2cugrF8W1P16irQMnz1CbH63mltH/oxn9DEZziV2bEmi3Fuq4i5m z7RMTttNjxTlG5c4RBmvsSF3DK+jB5zAY2feFDr0hpTLRRZDTJebEWiXRSM5OYudHA7L GjY8HwnyhZXwEscMtFFR4UcriE33EyCWqq3vOxBMnZxU0FuoTOlxhxBlZoivIW5YTkvu 7QmVEg/Bx1+kN/bxZo5oKEMamAhGCgPKfCleS4HIn+ihbbHXgFDA3u8MS+jp2/nVlXNM HXe7pKF4pHLXi4+4TD02rxVuufB1sV4B11Mvtp2hq6/VwGx/e0Ek8SbweYzhijqNH1aF bang== X-Received: by 10.15.108.141 with SMTP id cd13mr5254661eeb.46.1369850177694; Wed, 29 May 2013 10:56:17 -0700 (PDT) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id c5sm39867954eeu.8.2013.05.29.10.56.15 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 May 2013 10:56:16 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 29 May 2013 19:56:11 +0200 Message-Id: <1369850171-16754-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQm2OxLAgr3rbVbK7PvIFtj2pr1N5tIZq0v45/782CPZHMy6+JFGlLJhQVzJqeusBGt9HVJx Cc: Takashi Iwai , Daniel Vetter , Paulo Zanoni Subject: [Intel-gfx] [PATCH] drm/i915: fix up the edp power well check X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@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; }