aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/amd/powerplay/inc/smumgr.h6
-rw-r--r--drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c5
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
122extern int smu_free_memory(void *device, void *handle); 122extern int smu_free_memory(void *device, void *handle);
123 123
124extern int cz_smum_init(struct pp_smumgr *smumgr);
125extern int iceland_smum_init(struct pp_smumgr *smumgr);
126extern int tonga_smum_init(struct pp_smumgr *smumgr);
127extern int fiji_smum_init(struct pp_smumgr *smumgr);
128extern 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
37int smum_init(struct amd_pp_init *pp_init, struct pp_instance *handle) 32int smum_init(struct amd_pp_init *pp_init, struct pp_instance *handle)
38{ 33{