From patchwork Mon Nov 16 17:36:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324461 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503655ils; Mon, 16 Nov 2020 09:38:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJwceLEH5wcMV9BkaVRtsGz0asAoJEb3f/ADzj/iWpvrTlsrwLfxp+G202mCGtJNdFz4X3qO X-Received: by 2002:a62:fc8f:0:b029:18b:823a:13c2 with SMTP id e137-20020a62fc8f0000b029018b823a13c2mr15259834pfh.57.1605548290484; Mon, 16 Nov 2020 09:38:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548290; cv=none; d=google.com; s=arc-20160816; b=fT5NWqAhs142XN9YH++ejYTMHauvFHPN1XYh1j656JHcemf3TqYR1/t1nYFs6dFtR5 ThTdz9r7thLLVlQvXuofNP9aKtveVS1HleLu+YHBWqCyMkawJ6KqD/LK2ciRppHi3+X2 dU+XZ5V9XE8Qae2gPnXNX+PMmAK+m1tRzTMGk/v7jUDDqzDEtiTE2u2VXYgLF/Ltck83 j+4l38hPWqxgnhk/BVPCp9XBScVWmU3HBaQPaldFl/6QI4p+l9jmFZ9vloC4VwuYd/WZ 9zhS9fRwofZ8fnPwDvD6sv4RLXUoKWZIkHWmydldeU2+n5HOVTIofGYB0kxkD3sKsfpF DY5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=CW3N7dO4cIwmBneAW+Eyd9/DO5QArtlCBhRp+yTa6u8=; b=VmxRb6dVyyYvMB92QWlgEAo0cchzJi0CRY1e4MpN0ny8cvMFZctTkmuxZit2aofA26 WtGZsX1LYvIvBXYGsI+W84Pcq4XG69STOIIk2PXeargcYCYJjaXzzApFKvdjk7Bx9ix+ RzikTOdJAIYo8NrfgX4DKd5N12UL+LYD7AsYsxqOxjmfE6DrblnRSgjQ4ig4PyL2LVGE 5MCw1faNJ+IDC7VNIOziYeXrgmdqi9GQkiqQo0H3Pc7THu/BO7s5MSbARn6Av9vhkYGB FO57c29dagYuD+WuDFtINXlRCR8hrfw5rUcU/yRr7xojHEVblQuT0XrVUhG8XBfhMGrq Vt4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=sfgrxMG6; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id 143si15802426pgd.40.2020.11.16.09.38.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=sfgrxMG6; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 170506E092; Mon, 16 Nov 2020 17:37:54 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9749C6E04A for ; Mon, 16 Nov 2020 17:37:45 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id k2so19680554wrx.2 for ; Mon, 16 Nov 2020 09:37:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=F+vpUFKiF0HcP1zSRTFbAOX8pFoOA6PVK8Wzkj+zQXI=; b=sfgrxMG6CmVvxPp4PJ5OjjRHPczlJjKdH29Zymx3hfYfE28kkaxjfDWAx0nuOk+ddu ewVWB5vaa58WzoSuaKOe1y49Hirs7sGkZqF336HJXZqwi3+TilGnTvhmW7jNA+MmJVqG JQK6/e26iVfnIxjfwdOu4dgSMMxubz6qKpAu+soYAhohpvOFjnUIwxArHRVpuLZSFunx Sgee/pS7pRG9DTBsJujcROkhpOINwa00CJ6ZoBCiwcxI3O+iWhzxws4OjIo8XDqeSMSR uROJx71BUPkebIoSl/3XMWCrOKn+QNPS3p0MHC7DJqKD9yLppbd8PXwlGPpEP31XSpWa 9b9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=F+vpUFKiF0HcP1zSRTFbAOX8pFoOA6PVK8Wzkj+zQXI=; b=b5BuZWcXtWMmYHax6GydbtxwlserPIVoS3dPb4gspvXnsJmv48zpGHW2zmjFxPRN5V aBQuuP69zU8jTmxlvQWbMXjE186f6gBGSw/Kn6cwJp+1wvb+QD985ePWubxm/dL7Ic+J 2zFn0Ey932dtCkq6GkUJFOzWXpTWgZrXjfcPBjZlHi16seaqmsPOsHMIN8Nw98P6NsWF YXQErTTgSBSNMx5cKNa6PSlXdTaj0cgUNCa7u/QuNVS7WQLMVWnDgUKnhWI+PgUTGLcn AHky9USreo8sGKkfjQsyPlaio3E4/VxDDTuO7Wm6L1HG7GzF9KiJ2zaNop4EZpCfopvP uYHw== X-Gm-Message-State: AOAM533KOVikDMzd5b2SPCYkN52dOBJV5lsi6ofbuOVHLwsOeDJq30cy 2rpSRu4bAA15SNWPs/SwLnNldA== X-Received: by 2002:a5d:488b:: with SMTP id g11mr21841442wrq.210.1605548264298; Mon, 16 Nov 2020 09:37:44 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:43 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 29/43] drm/radeon/si_dpm: Move 'si_mc_load_microcode()'s prototype to shared header Date: Mon, 16 Nov 2020 17:36:46 +0000 Message-Id: <20201116173700.1830487-30-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201116173700.1830487-1-lee.jones@linaro.org> References: <20201116173700.1830487-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6?= =?utf-8?q?nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/si.c:1570:5: warning: no previous prototype for ‘si_mc_load_microcode’ [-Wmissing-prototypes] Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/si.c | 1 + drivers/gpu/drm/radeon/si.h | 31 +++++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/si_dpm.c | 2 +- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/radeon/si.h diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index d0407145c07b5..88731b79c8f57 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -39,6 +39,7 @@ #include "radeon_audio.h" #include "radeon_ucode.h" #include "si_blit_shaders.h" +#include "si.h" #include "sid.h" diff --git a/drivers/gpu/drm/radeon/si.h b/drivers/gpu/drm/radeon/si.h new file mode 100644 index 0000000000000..0a5018ef166e2 --- /dev/null +++ b/drivers/gpu/drm/radeon/si.h @@ -0,0 +1,31 @@ +/* si.h -- Private header for radeon driver -*- linux-c -*- + * + * Copyright 2011 Advanced Micro Devices, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef __SI_H__ +#define __SI_H__ + +struct radeon_device; + +int si_mc_load_microcode(struct radeon_device *rdev); + +#endif /* __SI_H__ */ diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c index c68ab2fb1ac23..32b697965c064 100644 --- a/drivers/gpu/drm/radeon/si_dpm.c +++ b/drivers/gpu/drm/radeon/si_dpm.c @@ -32,6 +32,7 @@ #include "radeon_asic.h" #include "ni_dpm.h" #include "si_dpm.h" +#include "si.h" #include "sid.h" #define MC_CG_ARB_FREQ_F0 0x0a @@ -1721,7 +1722,6 @@ static const struct si_powertune_data powertune_data_hainan = struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); -extern int si_mc_load_microcode(struct radeon_device *rdev); extern void vce_v1_0_enable_mgcg(struct radeon_device *rdev, bool enable); static int si_populate_voltage_value(struct radeon_device *rdev,