From patchwork Mon Nov 16 17:36:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324456 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503512ils; Mon, 16 Nov 2020 09:38:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJw7LJCGyaNdQDkotuhctiKRuOUdKOORQaUkRGTwndK5kgS2Kdqrhyj+++hhXTOLS1xi/bZT X-Received: by 2002:a17:90b:3687:: with SMTP id mj7mr17207888pjb.143.1605548280609; Mon, 16 Nov 2020 09:38:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548280; cv=none; d=google.com; s=arc-20160816; b=SFMfT0sTz7p5IRGvCsP9+b15NNdYSyQ4545/KbFqbGT33Qg2AUS0mir6g6ESZmJn4o P0O/DXWZbmFchsJXC2r+5cpiCJM0VMu9VLXRWAu+48sydBvGbtMMP4gQwO8HwM0MBTQ0 lHqOTOquW3PlydmLw8ouY6qgi09/EcRwN7bdbYX5VqNJhlfHyuTOZQyyrMDTkBreG1ml bngumqSzu0o40Yx1daQ0kJ1xmQc1moHzOeeg+4TebHtlRxzBssEhKmdVyqWAL2i0eUGD uGgawcUW3wil6n08Swuml3X8SV2pknjphILnt8oy4t/IXNK8+wK38nSqd+Ly0m/KsVh8 FQSg== 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=uflHa1WbR8SgNXa8Zgq79NlDqxbnOx3K/C+2f+6ic9S43Ucu50PKaMoNNxuehhoY3n 3AS9JUdiT52AWkeSkMeuubK755Ci427Tkz1NB+Yx0EXB7EpQw0qJBlWOqjmdOyvEj4TT Tzj/xbPTPVdqm0TsLfguC2AnvPklQb+OxPH9tNulj9z5lD3KCfDFF+uzDJqHN1uuP1uv 2BtArK1vmb52MdPlDaeN7Eb3kSOi/Us+DGz8Cew+eW1ys/fyZI6Z0OIxMP7g5NiCEfya CLc7+7thwoF3OZl9xBv6WLP254J1yWNhDffQLMOOVSfH1yk+iZJQb5gZnpDkTN1VWzHD 2nHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=rDoz2LOD; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 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. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id z25si11668538pgk.85.2020.11.16.09.38.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:00 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=rDoz2LOD; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 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 BC1BD6E064; Mon, 16 Nov 2020 17:37:52 +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 7F2416E067 for ; Mon, 16 Nov 2020 17:37:49 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id l1so19622936wrb.9 for ; Mon, 16 Nov 2020 09:37:49 -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=rDoz2LODwdktvJ9Y9EB13KeCm6PWI+1JaZSHYfxn0zExBSUAYcFF3Lk6Ktpw5Vwga8 aL0QXnr6CBahNfjRD5G4eKtK79HrTR4hmKiITJdzXnS0ED9XlTb2mt0hJeqqOcBwxmeR 05rnsgHtTUluKUDpP5sJhTd0r20O3S6oLrlgydUWSzxOQfL7knsKgSvaji3bHKLYTqHJ FvK5gDN2dVmttG7hb8l5OFk80iq7QiJ3jDsFhiGAEhryWjHOc+L4L2KVW/kUCftYR/yE MVyBHd1SJt/+YU3LZD24rx8hHt80lCb5WQ4tsk9PtPfzNzGI51M7c/IeZIR5U+Y2eTem nWfA== 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=JQVWv25cU9EgmtopvlrfDILC4yGY5yDxscjJdFe6DEyhzl0pkHdYYK08Xz1hQ3ytiX RkwufHboBFbRE2zvUOpvP5JE2k0+bvseBwzml6kOqGnXx/bDA3aB07HFHsHNNYt0S/KB lR7OL+8M5tZwHbnWtbk1FPD4bw6PikLJozL19plf7FRw9Qq4/tXliT2STepztYEZ+BFj mrF+a3ffKbO74l2jFETjjzgK/fqiAP/988pOY8Vq2ah9ZskYzSlOWJd5AVxFZ5HAHdEa CWZD/lYBcgHjsn1gY3+3jcq4SO3eOuSmtLBl+cGlfwct34DyNG4PJgzYKsPnTT8Goyai pifQ== X-Gm-Message-State: AOAM532T6ZhnnqnOWxNCRYtFIYzqTSw4bWlLiw5T+vEHIUXWr4RUPFku q5t052JTeOo1/k8MqavSgpjX7Q== X-Received: by 2002:a5d:5342:: with SMTP id t2mr20141378wrv.243.1605548268198; Mon, 16 Nov 2020 09:37:48 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:47 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 32/43] drm/radeon/btc_dpm: Move 'evergreen_get_pi's prototype to shared header Date: Mon, 16 Nov 2020 17:36:49 +0000 Message-Id: <20201116173700.1830487-33-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/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,