diff options
author | Rex Zhu <Rex.Zhu@amd.com> | 2016-08-11 07:52:25 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-09-14 15:10:28 -0400 |
commit | 1db422de72c31fcf81f31311468a747aad389fa5 (patch) | |
tree | 3b17a6bc6bf4eebe79e9d87bc0f8a9d27272c567 | |
parent | 519df8a6f21d4f7a86f137dd65f75ebf66663f7d (diff) |
drm/amd/powerplay: declare functions instand of include header file.
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/inc/smumgr.h b/drivers/gpu/drm/amd/powerplay/inc/smumgr.h index dede153afe65..34abfd2cde53 100644 --- a/drivers/gpu/drm/amd/powerplay/inc/smumgr.h +++ b/drivers/gpu/drm/amd/powerplay/inc/smumgr.h | |||
@@ -121,6 +121,12 @@ extern int smu_allocate_memory(void *device, uint32_t size, | |||
121 | 121 | ||
122 | extern int smu_free_memory(void *device, void *handle); | 122 | extern int smu_free_memory(void *device, void *handle); |
123 | 123 | ||
124 | extern int cz_smum_init(struct pp_smumgr *smumgr); | ||
125 | extern int iceland_smum_init(struct pp_smumgr *smumgr); | ||
126 | extern int tonga_smum_init(struct pp_smumgr *smumgr); | ||
127 | extern int fiji_smum_init(struct pp_smumgr *smumgr); | ||
128 | extern int polaris10_smum_init(struct pp_smumgr *smumgr); | ||
129 | |||
124 | #define SMUM_FIELD_SHIFT(reg, field) reg##__##field##__SHIFT | 130 | #define SMUM_FIELD_SHIFT(reg, field) reg##__##field##__SHIFT |
125 | 131 | ||
126 | #define SMUM_FIELD_MASK(reg, field) reg##__##field##_MASK | 132 | #define SMUM_FIELD_MASK(reg, field) reg##__##field##_MASK |
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c index e6dc95d2976d..83d8f7eac22e 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | |||
@@ -28,11 +28,6 @@ | |||
28 | #include "smumgr.h" | 28 | #include "smumgr.h" |
29 | #include "cgs_common.h" | 29 | #include "cgs_common.h" |
30 | #include "linux/delay.h" | 30 | #include "linux/delay.h" |
31 | #include "cz_smumgr.h" | ||
32 | #include "tonga_smumgr.h" | ||
33 | #include "iceland_smumgr.h" | ||
34 | #include "fiji_smumgr.h" | ||
35 | #include "polaris10_smumgr.h" | ||
36 | 31 | ||
37 | int smum_init(struct amd_pp_init *pp_init, struct pp_instance *handle) | 32 | int smum_init(struct amd_pp_init *pp_init, struct pp_instance *handle) |
38 | { | 33 | { |