| Message ID | 20201116173700.1830487-33-lee.jones@linaro.org |
|---|---|
| State | Accepted |
| Commit | 1c5ae3bae612e3ca7094a46134419fda3eaf5bdb |
| Headers | show |
| Series | Rid W=1 warnings from GPU | expand |
On Mon, Nov 16, 2020 at 12:38 PM Lee Jones <lee.jones@linaro.org> wrote: > > 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 <alexander.deucher@amd.com> > Cc: "Christian König" <christian.koenig@amd.com> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: amd-gfx@lists.freedesktop.org > Cc: dri-devel@lists.freedesktop.org > Signed-off-by: Lee Jones <lee.jones@linaro.org> Applied. Thanks! Alex > --- > 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 <linux/seq_file.h> > > #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 <linux/seq_file.h> > > #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 <linux/seq_file.h> > > #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, > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
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 <linux/seq_file.h> #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 <linux/seq_file.h> #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 <linux/seq_file.h> #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,
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 <alexander.deucher@amd.com> Cc: "Christian König" <christian.koenig@amd.com> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones <lee.jones@linaro.org> --- 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(-)