| Message ID | 20201116173700.1830487-35-lee.jones@linaro.org |
|---|---|
| State | Accepted |
| Commit | f47a9d09670d8a82b00bf2f7355c600507461c4a |
| 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/si.c:5678:5: warning: no previous prototype for ‘si_get_csb_size’ [-Wmissing-prototypes] > 5678 | u32 si_get_csb_size(struct radeon_device *rdev) > | ^~~~~~~~~~~~~~~ > drivers/gpu/drm/radeon/si.c:5710:6: warning: no previous prototype for ‘si_get_csb_buffer’ [-Wmissing-prototypes] > 5710 | void si_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer) > | ^~~~~~~~~~~~~~~~~ > > 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/evergreen.c | 3 +-- > drivers/gpu/drm/radeon/si.h | 2 ++ > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c > index 8fb0b8c3db5b5..4575e448e59df 100644 > --- a/drivers/gpu/drm/radeon/evergreen.c > +++ b/drivers/gpu/drm/radeon/evergreen.c > @@ -41,6 +41,7 @@ > #include "radeon_asic.h" > #include "radeon_audio.h" > #include "radeon_ucode.h" > +#include "si.h" > > #define DC_HPDx_CONTROL(x) (DC_HPD1_CONTROL + (x * 0xc)) > #define DC_HPDx_INT_CONTROL(x) (DC_HPD1_INT_CONTROL + (x * 0xc)) > @@ -218,8 +219,6 @@ void evergreen_pcie_gen2_enable(struct radeon_device *rdev); > void evergreen_program_aspm(struct radeon_device *rdev); > void cik_init_cp_pg_table(struct radeon_device *rdev); > > -extern u32 si_get_csb_size(struct radeon_device *rdev); > -extern void si_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); > extern u32 cik_get_csb_size(struct radeon_device *rdev); > extern void cik_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); > > diff --git a/drivers/gpu/drm/radeon/si.h b/drivers/gpu/drm/radeon/si.h > index f483a64d17050..310c58376f927 100644 > --- a/drivers/gpu/drm/radeon/si.h > +++ b/drivers/gpu/drm/radeon/si.h > @@ -32,5 +32,7 @@ u32 si_gpu_check_soft_reset(struct radeon_device *rdev); > void si_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc); > void si_rlc_reset(struct radeon_device *rdev); > void si_init_uvd_internal_cg(struct radeon_device *rdev); > +u32 si_get_csb_size(struct radeon_device *rdev); > +void si_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); > > #endif /* __SI_H__ */ > -- > 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/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 8fb0b8c3db5b5..4575e448e59df 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -41,6 +41,7 @@ #include "radeon_asic.h" #include "radeon_audio.h" #include "radeon_ucode.h" +#include "si.h" #define DC_HPDx_CONTROL(x) (DC_HPD1_CONTROL + (x * 0xc)) #define DC_HPDx_INT_CONTROL(x) (DC_HPD1_INT_CONTROL + (x * 0xc)) @@ -218,8 +219,6 @@ void evergreen_pcie_gen2_enable(struct radeon_device *rdev); void evergreen_program_aspm(struct radeon_device *rdev); void cik_init_cp_pg_table(struct radeon_device *rdev); -extern u32 si_get_csb_size(struct radeon_device *rdev); -extern void si_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); extern u32 cik_get_csb_size(struct radeon_device *rdev); extern void cik_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); diff --git a/drivers/gpu/drm/radeon/si.h b/drivers/gpu/drm/radeon/si.h index f483a64d17050..310c58376f927 100644 --- a/drivers/gpu/drm/radeon/si.h +++ b/drivers/gpu/drm/radeon/si.h @@ -32,5 +32,7 @@ u32 si_gpu_check_soft_reset(struct radeon_device *rdev); void si_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc); void si_rlc_reset(struct radeon_device *rdev); void si_init_uvd_internal_cg(struct radeon_device *rdev); +u32 si_get_csb_size(struct radeon_device *rdev); +void si_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); #endif /* __SI_H__ */
Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/si.c:5678:5: warning: no previous prototype for ‘si_get_csb_size’ [-Wmissing-prototypes] 5678 | u32 si_get_csb_size(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/si.c:5710:6: warning: no previous prototype for ‘si_get_csb_buffer’ [-Wmissing-prototypes] 5710 | void si_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer) | ^~~~~~~~~~~~~~~~~ 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/evergreen.c | 3 +-- drivers/gpu/drm/radeon/si.h | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-)