From patchwork Fri Nov 23 17:30:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 1796591 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 2738EDF254 for ; Fri, 23 Nov 2012 17:31:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1BADFE5F82 for ; Fri, 23 Nov 2012 09:31:46 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yh0-f49.google.com (mail-yh0-f49.google.com [209.85.213.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 2CB4FE6633 for ; Fri, 23 Nov 2012 09:30:59 -0800 (PST) Received: by mail-yh0-f49.google.com with SMTP id j52so634931yhj.36 for ; Fri, 23 Nov 2012 09:30:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=YjstiNWHLFaCO06piD3ZT70Sz2GW0lHKmwxdewFCVaY=; b=Mu48h2LYmnPh1syYsvvMykT41iwwexpf97yqI0cxk641jAiSHuUjajsYlmD++4K0WK KOILeNp7ofUNf3z62X9ZSk0KUDzXuFsO2QaGS6CGqT7rizQd1OHj8TDMbWbaoTt+jEdW 7qrlKeFZszzL0oK1Ip+rFVE5EBK6iC5uwPxyf6N0zofhBtRtn93JnceD1NEaQoKAD0nP 7mDjO3Dy2Gxq0swS9KnpzuXnK1magCoFZ4Tda8RsHNHHXGyH4uTBIvLnQNWTRwSZF7ec B07SR1epRiO6aeqd1y8PN7Q7mdM699U9MzEZ3PaUeUOrkj3x3y4PRZWmh9qAG3R/fUGu Y9ZQ== Received: by 10.100.246.35 with SMTP id t35mr1297419anh.52.1353691858490; Fri, 23 Nov 2012 09:30:58 -0800 (PST) Received: from vicky.domain.invalid ([187.112.188.105]) by mx.google.com with ESMTPS id h16sm6430977ani.0.2012.11.23.09.30.56 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 23 Nov 2012 09:30:57 -0800 (PST) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Fri, 23 Nov 2012 15:30:38 -0200 Message-Id: <1353691840-9913-2-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1353691840-9913-1-git-send-email-przanoni@gmail.com> References: <1353691840-9913-1-git-send-email-przanoni@gmail.com> Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 2/4] drm/i915: remove Haswell code from ironlake_fdi_pll_enable 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 From: Paulo Zanoni This function is not called on Haswell anymore. Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_display.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 3f7f62d..576eec0 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2840,18 +2840,14 @@ static void ironlake_fdi_pll_enable(struct intel_crtc *intel_crtc) POSTING_READ(reg); udelay(200); - /* On Haswell, the PLL configuration for ports and pipes is handled - * separately, as part of DDI setup */ - if (!IS_HASWELL(dev)) { - /* Enable CPU FDI TX PLL, always on for Ironlake */ - reg = FDI_TX_CTL(pipe); - temp = I915_READ(reg); - if ((temp & FDI_TX_PLL_ENABLE) == 0) { - I915_WRITE(reg, temp | FDI_TX_PLL_ENABLE); + /* Enable CPU FDI TX PLL, always on for Ironlake */ + reg = FDI_TX_CTL(pipe); + temp = I915_READ(reg); + if ((temp & FDI_TX_PLL_ENABLE) == 0) { + I915_WRITE(reg, temp | FDI_TX_PLL_ENABLE); - POSTING_READ(reg); - udelay(100); - } + POSTING_READ(reg); + udelay(100); } }