diff options
| author | Lee Jones <lee.jones@linaro.org> | 2020-11-16 17:36:53 +0000 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2020-11-16 15:56:35 -0500 |
| commit | c580cfc90b0aa1fa4b2bf6de3f299d030e6a4326 (patch) | |
| tree | 4e61ea5ed1f9265cc63dd081a8f5fe7de3f2b5f5 | |
| parent | 0a999f7d99c0b965da468e1969d29eb740e5a84a (diff) | |
| download | lwn-c580cfc90b0aa1fa4b2bf6de3f299d030e6a4326.tar.gz lwn-c580cfc90b0aa1fa4b2bf6de3f299d030e6a4326.zip | |
drm/radeon/evergreen: Move 'cik_*()'s prototypes to shared header
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/cik.c:6413:6: warning: no previous prototype for ‘cik_init_cp_pg_table’ [-Wmissing-prototypes]
6413 | void cik_init_cp_pg_table(struct radeon_device *rdev)
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/radeon/cik.c:6670:5: warning: no previous prototype for ‘cik_get_csb_size’ [-Wmissing-prototypes]
6670 | u32 cik_get_csb_size(struct radeon_device *rdev)
| ^~~~~~~~~~~~~~~~
drivers/gpu/drm/radeon/cik.c:6702:6: warning: no previous prototype for ‘cik_get_csb_buffer’ [-Wmissing-prototypes]
6702 | void cik_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer)
| ^~~~~~~~~~~~~~~~~~
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>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/radeon/cik.h | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/evergreen.c | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/cik.h b/drivers/gpu/drm/radeon/cik.h index 6630b9da9e7a..420207d19de5 100644 --- a/drivers/gpu/drm/radeon/cik.h +++ b/drivers/gpu/drm/radeon/cik.h @@ -30,5 +30,8 @@ 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); +void cik_init_cp_pg_table(struct radeon_device *rdev); +u32 cik_get_csb_size(struct radeon_device *rdev); +void cik_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); #endif /* __CIK_H__ */ diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 4575e448e59d..8e9e88bf1f43 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -31,6 +31,7 @@ #include "atom.h" #include "avivod.h" +#include "cik.h" #include "ni.h" #include "rv770.h" #include "evergreen.h" @@ -217,10 +218,6 @@ static void evergreen_gpu_init(struct radeon_device *rdev); void evergreen_fini(struct radeon_device *rdev); void evergreen_pcie_gen2_enable(struct radeon_device *rdev); void evergreen_program_aspm(struct radeon_device *rdev); -void cik_init_cp_pg_table(struct radeon_device *rdev); - -extern u32 cik_get_csb_size(struct radeon_device *rdev); -extern void cik_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); static const u32 evergreen_golden_registers[] = { |