From: Lee Jones Date: Mon, 16 Nov 2020 17:36:52 +0000 (+0000) Subject: drm/radeon/cik_sdma: Move 'amdgpu_cik_gpu_check_soft_reset()'s prototype to shared... X-Git-Tag: v5.11-rc1~206^2^2~258 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a999f7d99c0b965da468e1969d29eb740e5a84a;p=thirdparty%2Fkernel%2Flinux.git drm/radeon/cik_sdma: Move 'amdgpu_cik_gpu_check_soft_reset()'s prototype to shared header Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/cik.c:4845:5: warning: no previous prototype for ‘cik_gpu_check_soft_reset’ [-Wmissing-prototypes] 4845 | u32 cik_gpu_check_soft_reset(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~~ 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/cik.h b/drivers/gpu/drm/radeon/cik.h index 297b3c1ff804f..6630b9da9e7aa 100644 --- a/drivers/gpu/drm/radeon/cik.h +++ b/drivers/gpu/drm/radeon/cik.h @@ -29,5 +29,6 @@ void cik_enter_rlc_safe_mode(struct radeon_device *rdev); void cik_exit_rlc_safe_mode(struct radeon_device *rdev); int ci_mc_load_microcode(struct radeon_device *rdev); void cik_update_cg(struct radeon_device *rdev, u32 block, bool enable); +u32 cik_gpu_check_soft_reset(struct radeon_device *rdev); #endif /* __CIK_H__ */ diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c index 3c709ebe8d1ab..919b14845c3c7 100644 --- a/drivers/gpu/drm/radeon/cik_sdma.c +++ b/drivers/gpu/drm/radeon/cik_sdma.c @@ -27,14 +27,13 @@ #include "radeon_ucode.h" #include "radeon_asic.h" #include "radeon_trace.h" +#include "cik.h" #include "cikd.h" /* sdma */ #define CIK_SDMA_UCODE_SIZE 1050 #define CIK_SDMA_UCODE_VERSION 64 -u32 cik_gpu_check_soft_reset(struct radeon_device *rdev); - /* * sDMA - System DMA * Starting with CIK, the GPU has new asynchronous