| Message ID | 20201116173700.1830487-23-lee.jones@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| 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/r600.c:3480:5: warning: no previous prototype for ‘r600_ih_ring_alloc’ [-Wmissing-prototypes] > 3480 | int r600_ih_ring_alloc(struct radeon_device *rdev) > | ^~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/radeon/r600.c:3516:6: warning: no previous prototype for ‘r600_ih_ring_fini’ [-Wmissing-prototypes] > 3516 | void r600_ih_ring_fini(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: Sumit Semwal <sumit.semwal@linaro.org> > Cc: amd-gfx@lists.freedesktop.org > Cc: dri-devel@lists.freedesktop.org > Cc: linux-media@vger.kernel.org > Cc: linaro-mm-sig@lists.linaro.org > Signed-off-by: Lee Jones <lee.jones@linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/radeon/cik.c | 3 +-- > drivers/gpu/drm/radeon/r600.h | 2 ++ > drivers/gpu/drm/radeon/si.c | 3 +-- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c > index 315c4f3df3656..980b50d046cbc 100644 > --- a/drivers/gpu/drm/radeon/cik.c > +++ b/drivers/gpu/drm/radeon/cik.c > @@ -34,6 +34,7 @@ > #include "cik_blit_shaders.h" > #include "cikd.h" > #include "clearstate_ci.h" > +#include "r600.h" > #include "radeon.h" > #include "radeon_asic.h" > #include "radeon_audio.h" > @@ -125,8 +126,6 @@ MODULE_FIRMWARE("radeon/mullins_mec.bin"); > MODULE_FIRMWARE("radeon/mullins_rlc.bin"); > MODULE_FIRMWARE("radeon/mullins_sdma.bin"); > > -extern int r600_ih_ring_alloc(struct radeon_device *rdev); > -extern void r600_ih_ring_fini(struct radeon_device *rdev); > extern void si_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc); > extern void si_rlc_reset(struct radeon_device *rdev); > extern void si_init_uvd_internal_cg(struct radeon_device *rdev); > diff --git a/drivers/gpu/drm/radeon/r600.h b/drivers/gpu/drm/radeon/r600.h > index 2a3915f0039e4..e66ef58706cd8 100644 > --- a/drivers/gpu/drm/radeon/r600.h > +++ b/drivers/gpu/drm/radeon/r600.h > @@ -31,5 +31,7 @@ > struct radeon_device; > > u32 r600_gpu_check_soft_reset(struct radeon_device *rdev); > +int r600_ih_ring_alloc(struct radeon_device *rdev); > +void r600_ih_ring_fini(struct radeon_device *rdev); > > #endif /* __R600_H__ */ > diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c > index 45076c27d7ded..d0407145c07b5 100644 > --- a/drivers/gpu/drm/radeon/si.c > +++ b/drivers/gpu/drm/radeon/si.c > @@ -33,6 +33,7 @@ > #include "atom.h" > #include "clearstate_si.h" > #include "evergreen.h" > +#include "r600.h" > #include "radeon.h" > #include "radeon_asic.h" > #include "radeon_audio.h" > @@ -128,8 +129,6 @@ static void si_pcie_gen3_enable(struct radeon_device *rdev); > static void si_program_aspm(struct radeon_device *rdev); > extern void sumo_rlc_fini(struct radeon_device *rdev); > extern int sumo_rlc_init(struct radeon_device *rdev); > -extern int r600_ih_ring_alloc(struct radeon_device *rdev); > -extern void r600_ih_ring_fini(struct radeon_device *rdev); > static void si_enable_gui_idle_interrupt(struct radeon_device *rdev, > bool enable); > static void si_init_pg(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/cik.c b/drivers/gpu/drm/radeon/cik.c index 315c4f3df3656..980b50d046cbc 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -34,6 +34,7 @@ #include "cik_blit_shaders.h" #include "cikd.h" #include "clearstate_ci.h" +#include "r600.h" #include "radeon.h" #include "radeon_asic.h" #include "radeon_audio.h" @@ -125,8 +126,6 @@ MODULE_FIRMWARE("radeon/mullins_mec.bin"); MODULE_FIRMWARE("radeon/mullins_rlc.bin"); MODULE_FIRMWARE("radeon/mullins_sdma.bin"); -extern int r600_ih_ring_alloc(struct radeon_device *rdev); -extern void r600_ih_ring_fini(struct radeon_device *rdev); extern void si_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc); extern void si_rlc_reset(struct radeon_device *rdev); extern void si_init_uvd_internal_cg(struct radeon_device *rdev); diff --git a/drivers/gpu/drm/radeon/r600.h b/drivers/gpu/drm/radeon/r600.h index 2a3915f0039e4..e66ef58706cd8 100644 --- a/drivers/gpu/drm/radeon/r600.h +++ b/drivers/gpu/drm/radeon/r600.h @@ -31,5 +31,7 @@ struct radeon_device; u32 r600_gpu_check_soft_reset(struct radeon_device *rdev); +int r600_ih_ring_alloc(struct radeon_device *rdev); +void r600_ih_ring_fini(struct radeon_device *rdev); #endif /* __R600_H__ */ diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index 45076c27d7ded..d0407145c07b5 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -33,6 +33,7 @@ #include "atom.h" #include "clearstate_si.h" #include "evergreen.h" +#include "r600.h" #include "radeon.h" #include "radeon_asic.h" #include "radeon_audio.h" @@ -128,8 +129,6 @@ static void si_pcie_gen3_enable(struct radeon_device *rdev); static void si_program_aspm(struct radeon_device *rdev); extern void sumo_rlc_fini(struct radeon_device *rdev); extern int sumo_rlc_init(struct radeon_device *rdev); -extern int r600_ih_ring_alloc(struct radeon_device *rdev); -extern void r600_ih_ring_fini(struct radeon_device *rdev); static void si_enable_gui_idle_interrupt(struct radeon_device *rdev, bool enable); static void si_init_pg(struct radeon_device *rdev);
Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/r600.c:3480:5: warning: no previous prototype for ‘r600_ih_ring_alloc’ [-Wmissing-prototypes] 3480 | int r600_ih_ring_alloc(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/r600.c:3516:6: warning: no previous prototype for ‘r600_ih_ring_fini’ [-Wmissing-prototypes] 3516 | void r600_ih_ring_fini(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: Sumit Semwal <sumit.semwal@linaro.org> Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones <lee.jones@linaro.org> --- drivers/gpu/drm/radeon/cik.c | 3 +-- drivers/gpu/drm/radeon/r600.h | 2 ++ drivers/gpu/drm/radeon/si.c | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-)