| Message ID | 20201116173700.1830487-42-lee.jones@linaro.org |
|---|---|
| State | Accepted |
| Commit | f9eddd7ccf5be14042b7aff2bf80509fa20f853f |
| 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_cs.c:2343:5: warning: no previous prototype for ‘r600_dma_cs_next_reloc’ [-Wmissing-prototypes] > 2343 | int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, > | ^~~~~~~~~~~~~~~~~~~~~~ > > 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_cs.c | 3 +-- > drivers/gpu/drm/radeon/r600.h | 4 ++++ > drivers/gpu/drm/radeon/r600_cs.c | 1 + > 3 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c > index 53b75cf201958..0de79f3a7e3ff 100644 > --- a/drivers/gpu/drm/radeon/evergreen_cs.c > +++ b/drivers/gpu/drm/radeon/evergreen_cs.c > @@ -28,6 +28,7 @@ > > #include "radeon.h" > #include "radeon_asic.h" > +#include "r600.h" > #include "evergreend.h" > #include "evergreen_reg_safe.h" > #include "cayman_reg_safe.h" > @@ -37,8 +38,6 @@ > > #define REG_SAFE_BM_SIZE ARRAY_SIZE(evergreen_reg_safe_bm) > > -int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, > - struct radeon_bo_list **cs_reloc); > struct evergreen_cs_track { > u32 group_size; > u32 nbanks; > diff --git a/drivers/gpu/drm/radeon/r600.h b/drivers/gpu/drm/radeon/r600.h > index e66ef58706cd8..dbdff4568516b 100644 > --- a/drivers/gpu/drm/radeon/r600.h > +++ b/drivers/gpu/drm/radeon/r600.h > @@ -28,10 +28,14 @@ > #ifndef __R600_H__ > #define __R600_H__ > > +struct radeon_bo_list; > +struct radeon_cs_parser; > 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); > > +int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, > + struct radeon_bo_list **cs_reloc); > #endif /* __R600_H__ */ > diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c > index f20b619466816..dc68e538d5a97 100644 > --- a/drivers/gpu/drm/radeon/r600_cs.c > +++ b/drivers/gpu/drm/radeon/r600_cs.c > @@ -29,6 +29,7 @@ > > #include "radeon.h" > #include "radeon_asic.h" > +#include "r600.h" > #include "r600d.h" > #include "r600_reg_safe.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_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c index 53b75cf201958..0de79f3a7e3ff 100644 --- a/drivers/gpu/drm/radeon/evergreen_cs.c +++ b/drivers/gpu/drm/radeon/evergreen_cs.c @@ -28,6 +28,7 @@ #include "radeon.h" #include "radeon_asic.h" +#include "r600.h" #include "evergreend.h" #include "evergreen_reg_safe.h" #include "cayman_reg_safe.h" @@ -37,8 +38,6 @@ #define REG_SAFE_BM_SIZE ARRAY_SIZE(evergreen_reg_safe_bm) -int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, - struct radeon_bo_list **cs_reloc); struct evergreen_cs_track { u32 group_size; u32 nbanks; diff --git a/drivers/gpu/drm/radeon/r600.h b/drivers/gpu/drm/radeon/r600.h index e66ef58706cd8..dbdff4568516b 100644 --- a/drivers/gpu/drm/radeon/r600.h +++ b/drivers/gpu/drm/radeon/r600.h @@ -28,10 +28,14 @@ #ifndef __R600_H__ #define __R600_H__ +struct radeon_bo_list; +struct radeon_cs_parser; 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); +int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, + struct radeon_bo_list **cs_reloc); #endif /* __R600_H__ */ diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c index f20b619466816..dc68e538d5a97 100644 --- a/drivers/gpu/drm/radeon/r600_cs.c +++ b/drivers/gpu/drm/radeon/r600_cs.c @@ -29,6 +29,7 @@ #include "radeon.h" #include "radeon_asic.h" +#include "r600.h" #include "r600d.h" #include "r600_reg_safe.h"
Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/r600_cs.c:2343:5: warning: no previous prototype for ‘r600_dma_cs_next_reloc’ [-Wmissing-prototypes] 2343 | int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, | ^~~~~~~~~~~~~~~~~~~~~~ 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_cs.c | 3 +-- drivers/gpu/drm/radeon/r600.h | 4 ++++ drivers/gpu/drm/radeon/r600_cs.c | 1 + 3 files changed, 6 insertions(+), 2 deletions(-)