From patchwork Fri May 3 09:49:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2516521 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 91C73DF2E5 for ; Fri, 3 May 2013 09:52:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8F5A0E64A8 for ; Fri, 3 May 2013 02:52:19 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by gabe.freedesktop.org (Postfix) with ESMTP id AADE8E647E for ; Fri, 3 May 2013 02:50:07 -0700 (PDT) Received: by mail-wi0-f169.google.com with SMTP id h11so526518wiv.0 for ; Fri, 03 May 2013 02:50:06 -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=DRbiKt5BLQwXifD8Gxr4bfckcPSy//EzUzeAVhEV+lU=; b=E5ajLWOInoyIN9pY3rBBDhW/YknOmZEcY6Utwa1FHZ12dNT/BLTHO3pwDKa+dRltDV JC/sZVJNJpmwi/WnaLw6MGcAg8jHzCNHUlLg4q+GjqUyTqgFwhmqcT8gjj7Ay4UZAqXW hJP4KpE+sL9SPEkYaKAJBLe93E2qyKw/jCIxM= 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=DRbiKt5BLQwXifD8Gxr4bfckcPSy//EzUzeAVhEV+lU=; b=hPYz+3rHyRlMkVfW+NOw0VwrQTO8Le1CjQhFYOxIymY7EO4Y9DNz7ghJdU3W1YzGit ByawH+0GPmkSmgERJ4rCbOl8CGVUH1MjW7haiElxxt5f0jKunZh8FI6EsJ79ZcJmlU+n 9gLWIH7dXJ3+fsaeaVec9ruy1M+NVmeU3kfOzcL8Ri8ShYTxkTcGM/NLx7905R3zboKu 4nqf3KuMPk1FLjMKCjm7YEfSjRHSDf8wXhcUBeaUVfnYi4WNcdWXi/e8XVOPQTQa3sjN t+pyvG/DiGzokoJjqJKVZEgF5PEmikfeWuWKj+qp8cLTlOFpoNJhyZe89X/9ot2OCw7p 4M3g== X-Received: by 10.180.211.50 with SMTP id mz18mr39120062wic.24.1367574606884; Fri, 03 May 2013 02:50:06 -0700 (PDT) Received: from natalie.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id s1sm26070609wiz.2.2013.05.03.02.50.05 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 03 May 2013 02:50:06 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Fri, 3 May 2013 11:49:50 +0200 Message-Id: <1367574591-1714-5-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1367574591-1714-1-git-send-email-daniel.vetter@ffwll.ch> References: <20130503091923.GK5763@phenom.ffwll.local> <1367574591-1714-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQk8mwF1vY4cXbEM7/9CbFoYks/gL/kSJ5ZE9DnyBIWIVR2Z+SakB6Ttm7Ygs2pDNaOQ7jFM Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 5/6] drm/i915: make intel_cpt_verify_modeset static 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 Only one caller. Also drop the intel_ prefix as is now customary for platform specific and static functions. Reviewed-by: Paulo Zanoni Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 4 ++-- drivers/gpu/drm/i915/intel_drv.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index aa4de35..9ae60c2 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3229,7 +3229,7 @@ prepare: /* separate function? */ return pll; } -void intel_cpt_verify_modeset(struct drm_device *dev, int pipe) +static void cpt_verify_modeset(struct drm_device *dev, int pipe) { struct drm_i915_private *dev_priv = dev->dev_private; int dslreg = PIPEDSL(pipe); @@ -3334,7 +3334,7 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc) encoder->enable(encoder); if (HAS_PCH_CPT(dev)) - intel_cpt_verify_modeset(dev, intel_crtc->pipe); + cpt_verify_modeset(dev, intel_crtc->pipe); /* * There seems to be a race in PCH platform hw (at least on some diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 88890a3..e3108c0 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -718,7 +718,6 @@ extern void assert_pipe(struct drm_i915_private *dev_priv, enum pipe pipe, extern void intel_init_clock_gating(struct drm_device *dev); extern void intel_write_eld(struct drm_encoder *encoder, struct drm_display_mode *mode); -extern void intel_cpt_verify_modeset(struct drm_device *dev, int pipe); extern void intel_prepare_ddi(struct drm_device *dev); extern void hsw_fdi_link_train(struct drm_crtc *crtc); extern void intel_ddi_init(struct drm_device *dev, enum port port);