drm/radeon/cik: Move 'r600_ih_ring_{alloc, fini}()'s prototypes to shared header

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Lee Jones and committed by

Alex Deucher 5 years ago eb388a88 5561ecba

+4 -4

3 changed files

expand all

drivers

gpu

drm

radeon

cik.c

r600.h

si.c

+1 -2

drivers/gpu/drm/radeon/cik.c

··· 34 34 #include "cik_blit_shaders.h" 35 35 #include "cikd.h" 36 36 #include "clearstate_ci.h" 37 + #include "r600.h" 37 38 #include "radeon.h" 38 39 #include "radeon_asic.h" 39 40 #include "radeon_audio.h" ··· 126 125 MODULE_FIRMWARE("radeon/mullins_rlc.bin"); 127 126 MODULE_FIRMWARE("radeon/mullins_sdma.bin"); 128 127 129 - extern int r600_ih_ring_alloc(struct radeon_device *rdev); 130 - extern void r600_ih_ring_fini(struct radeon_device *rdev); 131 128 extern void si_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc); 132 129 extern void si_rlc_reset(struct radeon_device *rdev); 133 130 extern void si_init_uvd_internal_cg(struct radeon_device *rdev);

drivers/gpu/drm/radeon/r600.h

··· 31 31 struct radeon_device; 32 32 33 33 u32 r600_gpu_check_soft_reset(struct radeon_device *rdev); 34 + int r600_ih_ring_alloc(struct radeon_device *rdev); 35 + void r600_ih_ring_fini(struct radeon_device *rdev); 34 36 35 37 #endif /* __R600_H__ */

+1 -2

drivers/gpu/drm/radeon/si.c

··· 33 33 #include "atom.h" 34 34 #include "clearstate_si.h" 35 35 #include "evergreen.h" 36 + #include "r600.h" 36 37 #include "radeon.h" 37 38 #include "radeon_asic.h" 38 39 #include "radeon_audio.h" ··· 129 128 static void si_program_aspm(struct radeon_device *rdev); 130 129 extern void sumo_rlc_fini(struct radeon_device *rdev); 131 130 extern int sumo_rlc_init(struct radeon_device *rdev); 132 - extern int r600_ih_ring_alloc(struct radeon_device *rdev); 133 - extern void r600_ih_ring_fini(struct radeon_device *rdev); 134 131 static void si_enable_gui_idle_interrupt(struct radeon_device *rdev, 135 132 bool enable); 136 133 static void si_init_pg(struct radeon_device *rdev);