| Message ID | 20201116173700.1830487-19-lee.jones@linaro.org |
|---|---|
| State | Accepted |
| Commit | 586831d65c94c9b27909f1759613cca3c09afc50 |
| Headers | show |
| Series | Rid W=1 warnings from GPU | expand |
On Mon, Nov 16, 2020 at 12:37 PM Lee Jones <lee.jones@linaro.org> wrote: > > 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 <evan.quan@amd.com> > 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/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 | 4 ++++ > drivers/gpu/drm/radeon/rv770_dpm.c | 1 + > drivers/gpu/drm/radeon/si_dpm.c | 2 +- > 8 files changed, 11 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 a3f2bb44979fe..0e15916d0a948 100644 > --- a/drivers/gpu/drm/radeon/rv770.h > +++ b/drivers/gpu/drm/radeon/rv770.h > @@ -29,7 +29,11 @@ > #define __RADEON_RV770_H__ > > struct radeon_device; > +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); > -- > 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 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 a3f2bb44979fe..0e15916d0a948 100644 --- a/drivers/gpu/drm/radeon/rv770.h +++ b/drivers/gpu/drm/radeon/rv770.h @@ -29,7 +29,11 @@ #define __RADEON_RV770_H__ struct radeon_device; +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);
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 <evan.quan@amd.com> 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/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 | 4 ++++ drivers/gpu/drm/radeon/rv770_dpm.c | 1 + drivers/gpu/drm/radeon/si_dpm.c | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-)