On Thu, Sep 08, 2016 at 02:05:17PM +0800, Rex Zhu wrote: > Change-Id: I2550f3ced9f7b7ee4c3fc73716850e52bc5564ce > Signed-off-by: Rex Zhu <[email protected]> > Reviewed-by: Alex Deucher <[email protected]>
Reviewed-by: Huang Rui <[email protected]> > --- > drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 6 ++++++ > 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 dede153..34abfd2 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, > > extern int smu_free_memory(void *device, void *handle); > > +extern int cz_smum_init(struct pp_smumgr *smumgr); > +extern int iceland_smum_init(struct pp_smumgr *smumgr); > +extern int tonga_smum_init(struct pp_smumgr *smumgr); > +extern int fiji_smum_init(struct pp_smumgr *smumgr); > +extern int polaris10_smum_init(struct pp_smumgr *smumgr); > + > #define SMUM_FIELD_SHIFT(reg, field) reg##__##field##__SHIFT > > #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 e6dc95d..83d8f7e 100644 > --- a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c > +++ b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c > @@ -28,11 +28,6 @@ > #include "smumgr.h" > #include "cgs_common.h" > #include "linux/delay.h" > -#include "cz_smumgr.h" > -#include "tonga_smumgr.h" > -#include "iceland_smumgr.h" > -#include "fiji_smumgr.h" > -#include "polaris10_smumgr.h" > > int smum_init(struct amd_pp_init *pp_init, struct pp_instance *handle) > { > -- > 1.9.1 > > _______________________________________________ > amd-gfx mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
