On Wed, Mar 7, 2018 at 5:46 AM, Rex Zhu <rex....@amd.com> wrote: > smu7_smumgr.h should not be included in rv and vega, The common functions > for all smu7 asics are put in smu_smumgr.c. > > Not include cgs interface in smumgr.c. the code used cgs interface has been > deleted. > > Not include smu_ucode_xfer_vi.h in rv/vega > > Change-Id: I3c9751594919c9598aed6a518d1b02eb698de9ec > Signed-off-by: Rex Zhu <rex....@amd.com>
Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> > --- > drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c | 3 +-- > drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 1 - > drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 6 ++---- > 3 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c > b/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c > index e2ee23a..6362d46 100644 > --- a/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c > +++ b/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c > @@ -31,8 +31,7 @@ > #include "smu10.h" > #include "ppatomctrl.h" > #include "pp_debug.h" > -#include "smu_ucode_xfer_vi.h" > -#include "smu7_smumgr.h" > + > > #define VOLTAGE_SCALE 4 > > diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c > b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c > index 3645127..68d943d 100644 > --- a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c > +++ b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c > @@ -28,7 +28,6 @@ > #include <linux/types.h> > #include <drm/amdgpu_drm.h> > #include "smumgr.h" > -#include "cgs_common.h" > > MODULE_FIRMWARE("amdgpu/topaz_smc.bin"); > MODULE_FIRMWARE("amdgpu/topaz_k_smc.bin"); > diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c > b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c > index 15e1afa..ad4e8b4 100644 > --- a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c > +++ b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c > @@ -27,11 +27,9 @@ > #include "vega10_smumgr.h" > #include "vega10_ppsmc.h" > #include "smu9_driver_if.h" > - > #include "ppatomctrl.h" > #include "pp_debug.h" > -#include "smu_ucode_xfer_vi.h" > -#include "smu7_smumgr.h" > + > > #define AVFS_EN_MSB 1568 > #define AVFS_EN_LSB 1568 > @@ -386,7 +384,7 @@ static int vega10_smu_init(struct pp_hwmgr *hwmgr) > struct cgs_firmware_info info = {0}; > > ret = cgs_get_firmware_info(hwmgr->device, > - smu7_convert_fw_type_to_cgs(UCODE_ID_SMU), > + CGS_UCODE_ID_SMU, > &info); > if (ret || !info.kptr) > return -EINVAL; > -- > 1.9.1 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx