From patchwork Tue Nov 10 19:31:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 322883 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp500689ils; Tue, 10 Nov 2020 11:32:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJyLqXo7A1Fft12gShfmEJ1g2rEAzXN2tFgjr+exAg4xpFQdI0Zqj/4NyMSlAG8kjfIup+gD X-Received: by 2002:a17:902:82c2:b029:d6:c4d5:5f0e with SMTP id u2-20020a17090282c2b02900d6c4d55f0emr17853513plz.72.1605036728056; Tue, 10 Nov 2020 11:32:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605036728; cv=none; d=google.com; s=arc-20160816; b=ZGCLHTcyNzTrN6izEKEBztANvcf3sxVoEz4XzoMPFViFXFAh7FeSOrpTU0cSUGZ0m+ ikWlHebon98+i1bDK50jLsKFbgrwdmFsrCWX1rPC9P7ONgP+I8bScFrTSHeaUoemuXMK s107Z+CTEY6evajRq9rtg1uUOM1NtbKBau2lJMu3/DwMD4kcGJ9DBt3UZesyyt0yaz1a ns9ox2UPLn8Fxj5wRM9Rt1/GQ7+C+GAlaw5Ljc5B/aiHKkTR7TqayIU3jdWoegHNn/Ns vV1g9fAeL2F7o5ZlhEerCvQtC4viXsgEd+U3BtrkqQPK8tGtf1+PQOaUGkbhRKL4uCWX kwgQ== 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=aCAlImI7iWjbSj8ORQvpIV3QEWeV6c9A074E9GejnAA=; b=oLf1CuwbBJbpVmKRwSw9QWH16S2rgXC6CsLclrNobs0jK89jn/gbNguxX6/lOUfxOi 5NGWj45d/7XgY1EIRqZnhFMMjviev/bbHI7y72SDiBo6hK6fGVzOXjE8AoDp/eloIwQ4 kyHq+Znug4KPCzG0C4/zB3PhSjG6dRZtIfmn0pyzJdJUYj0/3sS5wAn/MhtOrrtubXMe 0XqlUzmcjN1dOJX1WoU+lxFX0hks+jTgCVmN3iH8/7bV2qzRVowMEll14coova1Ve9I3 6EfzzCgXNSkSke/Anyw4wIiAdPwMlinVSjOYIMy18Q6hgSo5yArlTFhjcjtlukvaeVhk /gZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=KiUNDt1p; 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 188si12289293pfg.26.2020.11.10.11.32.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 11:32:08 -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=KiUNDt1p; 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 2168289C51; Tue, 10 Nov 2020 19:31:56 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9074189C16 for ; Tue, 10 Nov 2020 19:31:47 +0000 (UTC) Received: by mail-wm1-x341.google.com with SMTP id 10so4354447wml.2 for ; Tue, 10 Nov 2020 11:31:47 -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=O9D4sdvgAf5ZpmG7WRKhdhcXCgCIe69NPhgbZH8YPLo=; b=KiUNDt1pIPZZdeRHH1IiNfbpdTZZJAixesDx6gTVlmC1kGISYte/3HPinHflWMH2aO rsw3FijzmVrzqK/ILIpm4YSAHvaeH0pKDB2gN92IM3Dsg8Qvdzf98TvkbvsHwCC6ym3e wJP5RtOIZw61M7EuzVDDUNViEk5jCpEZH1A6OY/R+NNhWE1pYiIpNyXs2xfPWw/0ryii z8iFLtGtnhL8rsZXzUMAM3JERcT2SdMImNQOXfW0y6jU7GgYSIY8kTA2/hzAO4xz9k2j QB7UsJp8g9Rn8ujubUuBo+UfsphKn1UcA8KgZQjdh8XjizsnIlCP6jGGFwyV/jcC4VQo 9GFw== 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=O9D4sdvgAf5ZpmG7WRKhdhcXCgCIe69NPhgbZH8YPLo=; b=NEcGJ+B6CyTSc3Fiec86JNZtNPtEETHhutsvv9B7JDJvqVaNfwa9pSJlPH2gky8Nbk 9i29Hpfc1xQ7wzD+ua2XjO39j1PdJhdpPjgR0zdrIED8ltxaM2NEIERaUfehfLbVC5xU fDr63ar6/DFoS6a0PUJEvGQHGMt176NwsW/+ljCCP4RWAsANLtFlICmQcM7RGrAScwR9 dKqIygABGnaN5yM+RSNFwJF/bb1FSsLKPTu8IL8IEEjGbwQmKxeraz3zOMKcjzTT67Sp l4Hbql91x53hPqGQXauoIqO/mPrrNqj+EJwCCNPlPbFNrKjWLgvwM1Zqd4dOPgEDyirz CUOA== X-Gm-Message-State: AOAM5334aHe5aQKfFON342kD0HKHfMHNmfSkYrpyQDHqEHX4Io4lDj0h bHeblXS73y73oCb+nmyehAXMlA== X-Received: by 2002:a1c:190:: with SMTP id 138mr667479wmb.113.1605036706165; Tue, 10 Nov 2020 11:31:46 -0800 (PST) Received: from dell.default ([91.110.221.139]) by smtp.gmail.com with ESMTPSA id 30sm17635335wrs.84.2020.11.10.11.31.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 11:31:45 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 24/30] drm/radeon/rv770: Move 'rv770_get_*()'s prototypes to shared header Date: Tue, 10 Nov 2020 19:31:06 +0000 Message-Id: <20201110193112.988999-25-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201110193112.988999-1-lee.jones@linaro.org> References: <20201110193112.988999-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 , Evan Quan , =?utf-8?q?Christian_K=C3=B6nig?= 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:47:18: warning: no previous prototype for ‘rv770_get_ps’ [-Wmissing-prototypes] 47 | struct rv7xx_ps *rv770_get_ps(struct radeon_ps *rps) | ^~~~~~~~~~~~ drivers/gpu/drm/radeon/rv770_dpm.c:54:26: warning: no previous prototype for ‘rv770_get_pi’ [-Wmissing-prototypes] 54 | struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev) | ^~~~~~~~~~~~ Cc: Evan Quan 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/ni_dpm.c | 2 +- drivers/gpu/drm/radeon/rv730_dpm.c | 4 +--- drivers/gpu/drm/radeon/rv740_dpm.c | 3 +-- drivers/gpu/drm/radeon/rv770.h | 5 +++++ drivers/gpu/drm/radeon/rv770_dpm.c | 1 + drivers/gpu/drm/radeon/si_dpm.c | 2 +- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/radeon/btc_dpm.c b/drivers/gpu/drm/radeon/btc_dpm.c index d1d8aaf8323c2..018949668536e 100644 --- a/drivers/gpu/drm/radeon/btc_dpm.c +++ b/drivers/gpu/drm/radeon/btc_dpm.c @@ -30,6 +30,7 @@ #include "btcd.h" #include "cypress_dpm.h" #include "r600_dpm.h" +#include "rv770.h" #include "radeon.h" #include "radeon_asic.h" @@ -48,8 +49,6 @@ #ifndef BTC_MGCG_SEQUENCE #define BTC_MGCG_SEQUENCE 300 -struct rv7xx_ps *rv770_get_ps(struct radeon_ps *rps); -struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev); struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); extern int ni_mc_load_microcode(struct radeon_device *rdev); diff --git a/drivers/gpu/drm/radeon/cypress_dpm.c b/drivers/gpu/drm/radeon/cypress_dpm.c index 35b177d777913..6d3690bcca2d2 100644 --- a/drivers/gpu/drm/radeon/cypress_dpm.c +++ b/drivers/gpu/drm/radeon/cypress_dpm.c @@ -28,6 +28,7 @@ #include "cypress_dpm.h" #include "evergreend.h" #include "r600_dpm.h" +#include "rv770.h" #include "radeon.h" #include "radeon_asic.h" @@ -43,8 +44,6 @@ #define MC_CG_SEQ_YCLK_SUSPEND 0x04 #define MC_CG_SEQ_YCLK_RESUME 0x0a -struct rv7xx_ps *rv770_get_ps(struct radeon_ps *rps); -struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev); struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); static void cypress_enable_bif_dynamic_pcie_gen2(struct radeon_device *rdev, diff --git a/drivers/gpu/drm/radeon/ni_dpm.c b/drivers/gpu/drm/radeon/ni_dpm.c index 59cdadcece159..d39bbd9793cc2 100644 --- a/drivers/gpu/drm/radeon/ni_dpm.c +++ b/drivers/gpu/drm/radeon/ni_dpm.c @@ -29,6 +29,7 @@ #include "ni_dpm.h" #include "nid.h" #include "r600_dpm.h" +#include "rv770.h" #include "radeon.h" #include "radeon_asic.h" @@ -719,7 +720,6 @@ static const u32 cayman_sysls_enable[] = }; #define CAYMAN_SYSLS_ENABLE_LENGTH sizeof(cayman_sysls_enable) / (3 * sizeof(u32)) -struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev); struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); extern int ni_mc_load_microcode(struct radeon_device *rdev); diff --git a/drivers/gpu/drm/radeon/rv730_dpm.c b/drivers/gpu/drm/radeon/rv730_dpm.c index 84a3d6d724866..a9de5c953396a 100644 --- a/drivers/gpu/drm/radeon/rv730_dpm.c +++ b/drivers/gpu/drm/radeon/rv730_dpm.c @@ -25,6 +25,7 @@ #include "radeon.h" #include "rv730d.h" #include "r600_dpm.h" +#include "rv770.h" #include "rv770_dpm.h" #include "atom.h" @@ -33,9 +34,6 @@ #define MC_CG_ARB_FREQ_F2 0x0c #define MC_CG_ARB_FREQ_F3 0x0d -struct rv7xx_ps *rv770_get_ps(struct radeon_ps *rps); -struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev); - int rv730_populate_sclk_value(struct radeon_device *rdev, u32 engine_clock, RV770_SMC_SCLK_VALUE *sclk) diff --git a/drivers/gpu/drm/radeon/rv740_dpm.c b/drivers/gpu/drm/radeon/rv740_dpm.c index 327d65a76e1f4..d57a3e1df8d63 100644 --- a/drivers/gpu/drm/radeon/rv740_dpm.c +++ b/drivers/gpu/drm/radeon/rv740_dpm.c @@ -25,11 +25,10 @@ #include "radeon.h" #include "rv740d.h" #include "r600_dpm.h" +#include "rv770.h" #include "rv770_dpm.h" #include "atom.h" -struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev); - u32 rv740_get_decoded_reference_divider(u32 encoded_ref) { u32 ref = 0; diff --git a/drivers/gpu/drm/radeon/rv770.h b/drivers/gpu/drm/radeon/rv770.h index de831684c9926..cf234d59f0475 100644 --- a/drivers/gpu/drm/radeon/rv770.h +++ b/drivers/gpu/drm/radeon/rv770.h @@ -28,6 +28,11 @@ #ifndef __RADEON_RV770_H__ #define __RADEON_RV770_H__ +struct radeon_ps; + void rv770_set_clk_bypass_mode(struct radeon_device *rdev); +struct rv7xx_ps *rv770_get_ps(struct radeon_ps *rps); +struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev); + #endif /* __RADEON_RV770_H__ */ diff --git a/drivers/gpu/drm/radeon/rv770_dpm.c b/drivers/gpu/drm/radeon/rv770_dpm.c index 4a0cf597c11c6..badd8ac6e038f 100644 --- a/drivers/gpu/drm/radeon/rv770_dpm.c +++ b/drivers/gpu/drm/radeon/rv770_dpm.c @@ -24,6 +24,7 @@ #include "radeon.h" #include "radeon_asic.h" +#include "rv770.h" #include "rv770d.h" #include "r600_dpm.h" #include "rv770_dpm.h" diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c index d1c73e9db889a..a80a21447a76d 100644 --- a/drivers/gpu/drm/radeon/si_dpm.c +++ b/drivers/gpu/drm/radeon/si_dpm.c @@ -27,6 +27,7 @@ #include "atom.h" #include "r600_dpm.h" +#include "rv770.h" #include "radeon.h" #include "radeon_asic.h" #include "si_dpm.h" @@ -1717,7 +1718,6 @@ static const struct si_powertune_data powertune_data_hainan = true }; -struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev); struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); struct ni_power_info *ni_get_pi(struct radeon_device *rdev); struct ni_ps *ni_get_ps(struct radeon_ps *rps);