From patchwork Mon Jan 6 16:33:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rashika X-Patchwork-Id: 3444311 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C17F09F2E9 for ; Tue, 7 Jan 2014 00:50:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0AFA72017B for ; Tue, 7 Jan 2014 00:50:41 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 390652016D for ; Tue, 7 Jan 2014 00:50:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C331B108695; Mon, 6 Jan 2014 16:49:41 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pb0-f49.google.com (mail-pb0-f49.google.com [209.85.160.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 37EE4FABD6 for ; Mon, 6 Jan 2014 08:33:09 -0800 (PST) Received: by mail-pb0-f49.google.com with SMTP id jt11so18646500pbb.22 for ; Mon, 06 Jan 2014 08:33:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=RlDq/+3+Ff/6qmLg8Q1mMZpYnHVK963gz+ykKqeBFdo=; b=S7fQx+D7j3JH37s9VtpsVS82bjOjQlDZp/bI7+ebgHvHXQZic77iATLa8p4iHqhHsy 4gN2J8EUNQo6Dq7VJd0xCiub54FgFAkl3yT+gmRWrmuJP6hqQ0+EFqjbl+ve9gVXT12x 4mZWz8sJqm01SDLgHf+FUkjCwm3aiSdS0hHAveTtH+44Rv/4h/cjt4lCmvSQKsESOxoh BVseRETMV+NYtsplC6a7Dp82jeio/rKD4O+v9xpDIOL3fKX7TbN5lMu7ykwrDrtVKJhy sIWkUcOhlyjC4qHJ8XfaFW2td6KvHTj6158ND5T2iT2oNNd2OzH49oUlOU/eAmOpfhZP tYEw== X-Received: by 10.68.89.162 with SMTP id bp2mr9168760pbb.151.1389025989047; Mon, 06 Jan 2014 08:33:09 -0800 (PST) Received: from rashika ([14.139.82.6]) by mx.google.com with ESMTPSA id ju10sm129912868pbd.33.2014.01.06.08.33.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 06 Jan 2014 08:33:08 -0800 (PST) Date: Mon, 6 Jan 2014 22:03:03 +0530 From: Rashika Kheria To: linux-kernel@vger.kernel.org Subject: [PATCH 69/85] drivers: gpu: Move prototype declarations to header file si_dpm.h Message-ID: <6e70b39b20fe5bb12e96306368b3f8eeacda08b8.1389018325.git.rashika.kheria@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Mailman-Approved-At: Mon, 06 Jan 2014 16:49:00 -0800 Cc: Stephen Rothwell , josh@joshtriplett.org, dri-devel@lists.freedesktop.org, Rashika Kheria , Alex Deucher X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.4 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 Move prototype declarations of functions si_get_ddr3_mclk_frequency_ratio(), si_get_mclk_frequency_ratio() and si_trim_voltage_table_to_fit_state_table() to header file drm/radeon/si_dpm.h because they are used by more than one file. This eliminates the following warnings from drm/radeon/si_dpm.c: drivers/gpu/drm/radeon/si_dpm.c:3698:4: warning: no previous prototype for ‘si_get_ddr3_mclk_frequency_ratio’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/si_dpm.c:3711:4: warning: no previous prototype for ‘si_get_mclk_frequency_ratio’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/si_dpm.c:3793:6: warning: no previous prototype for ‘si_trim_voltage_table_to_fit_state_table’ [-Wmissing-prototypes] Signed-off-by: Rashika Kheria Reviewed-by: Josh Triplett --- drivers/gpu/drm/radeon/ci_dpm.c | 6 +----- drivers/gpu/drm/radeon/si_dpm.h | 7 +++++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c index 899c843..7b3c412 100644 --- a/drivers/gpu/drm/radeon/ci_dpm.c +++ b/drivers/gpu/drm/radeon/ci_dpm.c @@ -27,6 +27,7 @@ #include "cikd.h" #include "r600_dpm.h" #include "ci_dpm.h" +#include "si_dpm.h" #include "atom.h" #include @@ -165,11 +166,6 @@ extern void btc_get_max_clock_from_voltage_dependency_table(struct radeon_clock_ u32 *max_clock); extern int ni_copy_and_switch_arb_sets(struct radeon_device *rdev, u32 arb_freq_src, u32 arb_freq_dest); -extern u8 si_get_ddr3_mclk_frequency_ratio(u32 memory_clock); -extern u8 si_get_mclk_frequency_ratio(u32 memory_clock, bool strobe_mode); -extern void si_trim_voltage_table_to_fit_state_table(struct radeon_device *rdev, - u32 max_voltage_steps, - struct atom_voltage_table *voltage_table); static int ci_get_std_voltage_value_sidd(struct radeon_device *rdev, struct atom_voltage_table_entry *voltage_table, diff --git a/drivers/gpu/drm/radeon/si_dpm.h b/drivers/gpu/drm/radeon/si_dpm.h index 4ce5032..7c65e55 100644 --- a/drivers/gpu/drm/radeon/si_dpm.h +++ b/drivers/gpu/drm/radeon/si_dpm.h @@ -194,6 +194,13 @@ struct si_power_info { PP_SIslands_PAPMParameters papm_parm; }; +u8 si_get_ddr3_mclk_frequency_ratio(u32 memory_clock); +u8 si_get_mclk_frequency_ratio(u32 memory_clock, bool strobe_mode); +void si_trim_voltage_table_to_fit_state_table(struct radeon_device *rdev, + u32 max_voltage_steps, + struct atom_voltage_table *voltage_table); + + #define SISLANDS_INITIAL_STATE_ARB_INDEX 0 #define SISLANDS_ACPI_STATE_ARB_INDEX 1 #define SISLANDS_ULV_STATE_ARB_INDEX 2