From patchwork Thu Apr 18 08:46:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2458001 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 091F0DF2E5 for ; Thu, 18 Apr 2013 08:47:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 256E0E6330 for ; Thu, 18 Apr 2013 01:47:24 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f175.google.com (mail-ea0-f175.google.com [209.85.215.175]) by gabe.freedesktop.org (Postfix) with ESMTP id 3EB52E62BA for ; Thu, 18 Apr 2013 01:43:29 -0700 (PDT) Received: by mail-ea0-f175.google.com with SMTP id f15so136002eak.20 for ; Thu, 18 Apr 2013 01:43:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=L0abwvoLCKKTfM08ZelpHIjoBSjazG/KLoRfWuRYca4=; b=fUBEx0+Ae2u/opxNaPkuPNzCWmNes0nRbQ8sbqd3QjdfqdkGZRe1ZuI0MGCPJGkbI9 oxHbWOhlDivuhKOJxtpB7enea2xTNErAgeL7nM9vVGKDFpzclJGXCtb7CbwA3Ijtln0S dyrw1b+n606CRN5Iy8NjLzkX4Ny1+e2LDjca8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=L0abwvoLCKKTfM08ZelpHIjoBSjazG/KLoRfWuRYca4=; b=bIxBYz+4i5pNwp7kpxWrISBIiA+VdW5oDRWm7S7sFT1380UBR9q/Y8C4Y/qRm8tf/g hy9sr9zlIADGDL7pvG27lg7z15XZ56xqV00R5DMvTPF/NZMcgG1qv740WdI3XjcCklZV UFQFP6lkaWHh+W30sTqXBBFYDmVUTSa7RmiEVq/zG8pTuQItk+z+ulAbbKgQ+c6qnnAW tZ4xNbWtVr59ZVqHn2EOp0kRO10dFD93vrYUWwc1LULwLT/jYfzuguOsSfQN5bF13SUl skAVcPFb9bC9M6mBKVNzeHxqRe5kB9mqo6aHXso86mogaj3LOgdSdWxSLPVUrma1NDHX H6Dg== X-Received: by 10.15.31.197 with SMTP id y45mr27836584eeu.18.1366274608171; Thu, 18 Apr 2013 01:43:28 -0700 (PDT) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id u44sm14093490eel.7.2013.04.18.01.43.26 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Apr 2013 01:43:27 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 18 Apr 2013 10:46:14 +0200 Message-Id: <1366274775-10733-7-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1366274775-10733-1-git-send-email-daniel.vetter@ffwll.ch> References: <20130418081740.GE6169@phenom.ffwll.local> <1366274775-10733-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQmA6Lu4G4zZL2nU4NYYVBMMmzgpn1yGvEwh0zSZ78uDk8qPhCJSUl7iJNTQYlG5XIHDIhj4 Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 7/8] Move encoder enable around 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 -> Will break everything else. --- drivers/gpu/drm/i915/intel_display.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index df3132c..7042b2f 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3866,6 +3866,9 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc) if (encoder->pre_enable) encoder->pre_enable(encoder); + for_each_encoder_on_crtc(dev, crtc, encoder) + encoder->enable(encoder); + if (IS_VALLEYVIEW(dev)) { char port; @@ -3894,9 +3897,6 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc) /* Give the overlay scaler a chance to enable if it's on this pipe */ intel_crtc_dpms_overlay(intel_crtc, true); intel_crtc_update_cursor(crtc, true); - - for_each_encoder_on_crtc(dev, crtc, encoder) - encoder->enable(encoder); } static void i9xx_pfit_disable(struct intel_crtc *crtc)