From patchwork Thu Aug 21 20:09:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 4759711 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3968DC0338 for ; Thu, 21 Aug 2014 20:09:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 75D342018A for ; Thu, 21 Aug 2014 20:09:57 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A1FFC2017D for ; Thu, 21 Aug 2014 20:09:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4F3946E812; Thu, 21 Aug 2014 13:09:56 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yh0-f53.google.com (mail-yh0-f53.google.com [209.85.213.53]) by gabe.freedesktop.org (Postfix) with ESMTP id 39DDE6E812 for ; Thu, 21 Aug 2014 13:09:55 -0700 (PDT) Received: by mail-yh0-f53.google.com with SMTP id c41so8463503yho.40 for ; Thu, 21 Aug 2014 13:09:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9BEnrCNHOp0xvpH9tZ+xXP3wmeH3dtcXIDmWm6WOUDA=; b=l6wKaiGCwr/tCVE/vZAyKpB7HezxRVThtW95INXdTkXD0FAPttc5rsA/c22M/kh7om hcxzkoki/SqB2vlOO8B2aLApv36bi6jpoLL5S+ULF7bXJBx/bFkyCjXAazMpzJ8lm3+C GwE8dYyk0uTRe24FNAtoGEkFkCwDtXl+r2szvfDKpjXVA/AtiYw+us8bCmscUG8vQG84 MC1wNmL4LrziqQhGl7mtbbEV+SDPwOmB47YNA4Fv07kiFL2QDPWtDTlVOwYfJHrnIixZ rn5nQEV+ZZzAMLu8YUfXlyPOuZQwDqwRVpFHGSW6E0jF0GOBxPpmBP2hfZuK7c/Y4qTJ rWtg== X-Received: by 10.236.170.230 with SMTP id p66mr850501yhl.15.1408651794792; Thu, 21 Aug 2014 13:09:54 -0700 (PDT) Received: from localhost.localdomain ([177.16.191.205]) by mx.google.com with ESMTPSA id u47sm54812021yhm.35.2014.08.21.13.09.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Aug 2014 13:09:54 -0700 (PDT) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Thu, 21 Aug 2014 17:09:37 -0300 Message-Id: <1408651778-2636-2-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1408651778-2636-1-git-send-email-przanoni@gmail.com> References: <1408651778-2636-1-git-send-email-przanoni@gmail.com> Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 2/3] drm/i915: rename gen8_init_clock_gating to broadwell_init_clock_gating X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Paulo Zanoni Because CHV uses cherryview_init_clock_gating instead of gen8_init_clock_gating. Signed-off-by: Paulo Zanoni Reviewed-by: Damien Lespiau --- drivers/gpu/drm/i915/intel_pm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) I really wish we were using the three-letter-acronyms instead of the full names on the functions. If I send another patch renaming everything, will anybody complain? diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index b3e948f..35495fc 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -5502,7 +5502,7 @@ static void lpt_suspend_hw(struct drm_device *dev) } } -static void gen8_init_clock_gating(struct drm_device *dev) +static void broadwell_init_clock_gating(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; enum pipe pipe; @@ -7251,7 +7251,7 @@ void intel_init_pm(struct drm_device *dev) else if (IS_HASWELL(dev)) dev_priv->display.init_clock_gating = haswell_init_clock_gating; else if (INTEL_INFO(dev)->gen == 8) - dev_priv->display.init_clock_gating = gen8_init_clock_gating; + dev_priv->display.init_clock_gating = broadwell_init_clock_gating; } else if (IS_CHERRYVIEW(dev)) { dev_priv->display.update_wm = cherryview_update_wm; dev_priv->display.update_sprite_wm = valleyview_update_sprite_wm;