From: Lee Jones Date: Mon, 16 Nov 2020 17:36:58 +0000 (+0000) Subject: drm/radeon/evergreen_cs: Move 'r600_dma_cs_next_reloc()'s prototype to shared header X-Git-Tag: io_uring-5.11-2020-12-23~116^2^2~252 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f9eddd7ccf5be14042b7aff2bf80509fa20f853f;p=linux-2.6-block.git drm/radeon/evergreen_cs: Move 'r600_dma_cs_next_reloc()'s prototype to shared header 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 Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c index 53b75cf20195..0de79f3a7e3f 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 57f83c9e7ccb..652b74c59be5 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 f20b61946681..dc68e538d5a9 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"