Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 847e8261 authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amd/pp: Clean up header file include 



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

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent fd06518d

drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c

+1 −2
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c

+0 −1
Original line number Diff line number Diff line
@@ -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");

drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c

+2 −4
Original line number Diff line number Diff line
@@ -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
@@ -383,7 +381,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;