From patchwork Wed Nov 11 18:35:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324137 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp623068ils; Wed, 11 Nov 2020 10:36:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJzkS5r76pxQNJZhjkIrUXEuiU4YQo9TN93A/1mwy9pk75QvczBu5FMl7oYrGRnm5bUqA/HE X-Received: by 2002:a17:902:74c7:b029:d7:e593:fcb with SMTP id f7-20020a17090274c7b02900d7e5930fcbmr13879708plt.71.1605119777498; Wed, 11 Nov 2020 10:36:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119777; cv=none; d=google.com; s=arc-20160816; b=yW4s83shemfFrFLHiQlaHHWAW6+5rWzxDbLYx3578kdqy4te5t3KHNCCeQsANaBDMt WWB9Gmn8h3Fvb12wiFRtZUvnRSqj72CIkWDgP3arOeGleBHr80W6SlD0zOEObY/DhDNR 9lvpr/rcbadKmGM8xXIRohikgTqrnzyC/gotsBArfnClE8FS31NsZI07Zx68Y+9lPPpk OlW1BumiXWqZ71krGKrFS94n2gzn71WVsfzAvP9A/Vbez5AXlrnsHHisL4ESZTqpw3zn OIfQCsAEgzadURgfKnCrDpYXXOp/GtQkRhxImjp2p7Vnp0hcYtuuap+D28XF+NYkl3Nj yiNw== 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=F5fslplSyKWklhTSeMS3mx7UbOsJnD1yCRg+7LEIcAA=; b=gXDNfLPmyBN36FmHp2xwci2qnILPKGh34zvCQJEa0mcyBzxFwVsfL+ISzNLJhJJTfv pZTktNIMF5AvSpU6Je/g/YHwgm0hMtWVQLDOJby0hgHUxyH2X8Hz75GwzhrF9R35IqLM xF5ju0oNBCrsY2vMQEy8B01SC1rbQ4fcmqUs/NOTIgZK4At6adFvbjDgJ/0x+X24Uqjk 91r3uqcldlX9UjSKxOfZG2zVt67QcCRHE3N4WT1Zwoj6kJyYME9Vuk7lh4k2iLwjzIQU TDNArtYoNLwG+couo9Q2ezg3nM24yJD8WAKs35UBhYH12Aa9JTpbJMucbuw2YWJFMtH+ YcvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=NJd73JO8; 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 d7si2259744pgq.421.2020.11.11.10.36.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:17 -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=NJd73JO8; 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 DB64A6E0C6; Wed, 11 Nov 2020 18:36:13 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id 055FF6E0C2 for ; Wed, 11 Nov 2020 18:36:05 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id p8so3511368wrx.5 for ; Wed, 11 Nov 2020 10:36:04 -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=wQLiBxHM+lzm9ozhMmLXV+2+mYaIBz41oWImWz9w9hM=; b=NJd73JO8AhCRjn0Dimt7Zx7LwVzjPfPvz0Q7de5mm4lbH4VN3T9g5lqmYSLnuOF9tu b28psdPSe3h3rvZaBt6PTzgVQlcTjC6+q9zysQzBn/Izo1sivArJskR3h6+W5zQqrLa0 LFAPYjhnNOTSf2/p6AQo5OVfp0ojT9L2+od3s3nAMfOSZsGqOfw9gmWL7zEnvuWwWI4a zqh5I2d5C5qjcMsxvkOLggAj3Rh1DmaXOu7qWzqL3YnsRGfm6+foHZpFoeOd0lXZkJKu dC2Ymmsle3SOm4Qp4Gqmx549kx5S+59K92JhnUPnMXR3Udq1Qy1LtxUVQOk6+1d4O5FK w+cA== 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=wQLiBxHM+lzm9ozhMmLXV+2+mYaIBz41oWImWz9w9hM=; b=D88NIdWLwMuwT/bGTJZsD+hSgEOfYH1HJcwf8YSCaWJHw6m7Aq4aARwHr7QgaOTq8S CscHmI6j4s2Zu/J633gOdH5wAovZ7ES4Uw6uO5lviqtHJGgn5y+izP5BmiT/Pb/nHXbk QU6nLWVWAhAswGwtJvL68IWn6wdhb/F3fn64WLFScW2B9k+4M2OcPWQkeSvYWeR+Uf3U NvsbmoYz8+NDI16liuJerxKpAf4T54m1CbYCXb++EF0tu1A1kR7bkEO7q4xRGBpj+Daf kRXCa/OJwnPoSC7Nt6pDj9XZxrjFxufeS8zkNk5PweBPnMzNH7ti68tw+1pWMjtaj1nq m0sg== X-Gm-Message-State: AOAM533TXGIztMMmXhXrp6L5ZC8rHH7kDJxacDpNOEqO6EXi9q6vvtd5 SfDy+4fe5c66OzxWuSdLSU2nXjFuteUHlcJz X-Received: by 2002:a5d:654a:: with SMTP id z10mr9037894wrv.285.1605119763560; Wed, 11 Nov 2020 10:36:03 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.36.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:02 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 10/19] drm/radeon/btc_dpm: Move 'evergreen_get_pi's prototype to shared header Date: Wed, 11 Nov 2020 18:35:36 +0000 Message-Id: <20201111183545.1756994-11-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201111183545.1756994-1-lee.jones@linaro.org> References: <20201111183545.1756994-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/rv770_dpm.c:62:30: warning: no previous prototype for ‘evergreen_get_pi’ [-Wmissing-prototypes] 62 | struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~ 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/btc_dpm.c | 3 +-- drivers/gpu/drm/radeon/cypress_dpm.c | 3 +-- drivers/gpu/drm/radeon/evergreen.h | 2 ++ drivers/gpu/drm/radeon/ni_dpm.c | 3 +-- drivers/gpu/drm/radeon/rv770_dpm.c | 1 + drivers/gpu/drm/radeon/si_dpm.c | 3 +-- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/radeon/btc_dpm.c b/drivers/gpu/drm/radeon/btc_dpm.c index 018949668536e..4e64ed38c439f 100644 --- a/drivers/gpu/drm/radeon/btc_dpm.c +++ b/drivers/gpu/drm/radeon/btc_dpm.c @@ -29,6 +29,7 @@ #include "btc_dpm.h" #include "btcd.h" #include "cypress_dpm.h" +#include "evergreen.h" #include "r600_dpm.h" #include "rv770.h" #include "radeon.h" @@ -49,8 +50,6 @@ #ifndef BTC_MGCG_SEQUENCE #define BTC_MGCG_SEQUENCE 300 -struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); - extern int ni_mc_load_microcode(struct radeon_device *rdev); //********* BARTS **************// diff --git a/drivers/gpu/drm/radeon/cypress_dpm.c b/drivers/gpu/drm/radeon/cypress_dpm.c index 6d3690bcca2d2..fdddbbaecbb74 100644 --- a/drivers/gpu/drm/radeon/cypress_dpm.c +++ b/drivers/gpu/drm/radeon/cypress_dpm.c @@ -26,6 +26,7 @@ #include "atom.h" #include "cypress_dpm.h" +#include "evergreen.h" #include "evergreend.h" #include "r600_dpm.h" #include "rv770.h" @@ -44,8 +45,6 @@ #define MC_CG_SEQ_YCLK_SUSPEND 0x04 #define MC_CG_SEQ_YCLK_RESUME 0x0a -struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); - static void cypress_enable_bif_dynamic_pcie_gen2(struct radeon_device *rdev, bool enable) { diff --git a/drivers/gpu/drm/radeon/evergreen.h b/drivers/gpu/drm/radeon/evergreen.h index f8d772e612a48..a829deb8b078a 100644 --- a/drivers/gpu/drm/radeon/evergreen.h +++ b/drivers/gpu/drm/radeon/evergreen.h @@ -29,6 +29,7 @@ #define __RADEON_EVERGREEN_H__ struct evergreen_mc_save; +struct evergreen_power_info; struct radeon_device; bool evergreen_is_display_hung(struct radeon_device *rdev); @@ -49,5 +50,6 @@ u32 evergreen_get_number_of_dram_channels(struct radeon_device *rdev); void evergreen_print_gpu_status_regs(struct radeon_device *rdev); u32 evergreen_gpu_check_soft_reset(struct radeon_device *rdev); int evergreen_rlc_resume(struct radeon_device *rdev); +struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); #endif /* __RADEON_EVERGREEN_H__ */ diff --git a/drivers/gpu/drm/radeon/ni_dpm.c b/drivers/gpu/drm/radeon/ni_dpm.c index d39bbd9793cc2..dd5ef64937230 100644 --- a/drivers/gpu/drm/radeon/ni_dpm.c +++ b/drivers/gpu/drm/radeon/ni_dpm.c @@ -26,6 +26,7 @@ #include #include "atom.h" +#include "evergreen.h" #include "ni_dpm.h" #include "nid.h" #include "r600_dpm.h" @@ -720,8 +721,6 @@ static const u32 cayman_sysls_enable[] = }; #define CAYMAN_SYSLS_ENABLE_LENGTH sizeof(cayman_sysls_enable) / (3 * sizeof(u32)) -struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); - extern int ni_mc_load_microcode(struct radeon_device *rdev); struct ni_power_info *ni_get_pi(struct radeon_device *rdev) diff --git a/drivers/gpu/drm/radeon/rv770_dpm.c b/drivers/gpu/drm/radeon/rv770_dpm.c index badd8ac6e038f..ef2f1a048cfed 100644 --- a/drivers/gpu/drm/radeon/rv770_dpm.c +++ b/drivers/gpu/drm/radeon/rv770_dpm.c @@ -30,6 +30,7 @@ #include "rv770_dpm.h" #include "cypress_dpm.h" #include "atom.h" +#include "evergreen.h" #include #define MC_CG_ARB_FREQ_F0 0x0a diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c index 32b697965c064..b4581392fbce9 100644 --- a/drivers/gpu/drm/radeon/si_dpm.c +++ b/drivers/gpu/drm/radeon/si_dpm.c @@ -26,6 +26,7 @@ #include #include "atom.h" +#include "evergreen.h" #include "r600_dpm.h" #include "rv770.h" #include "radeon.h" @@ -1720,8 +1721,6 @@ static const struct si_powertune_data powertune_data_hainan = true }; -struct evergreen_power_info *evergreen_get_pi(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,