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

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
...@@ -31,8 +31,7 @@ ...@@ -31,8 +31,7 @@
#include "smu10.h" #include "smu10.h"
#include "ppatomctrl.h" #include "ppatomctrl.h"
#include "pp_debug.h" #include "pp_debug.h"
#include "smu_ucode_xfer_vi.h"
#include "smu7_smumgr.h"
#define VOLTAGE_SCALE 4 #define VOLTAGE_SCALE 4
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <drm/amdgpu_drm.h> #include <drm/amdgpu_drm.h>
#include "smumgr.h" #include "smumgr.h"
#include "cgs_common.h"
MODULE_FIRMWARE("amdgpu/topaz_smc.bin"); MODULE_FIRMWARE("amdgpu/topaz_smc.bin");
MODULE_FIRMWARE("amdgpu/topaz_k_smc.bin"); MODULE_FIRMWARE("amdgpu/topaz_k_smc.bin");
......
...@@ -27,11 +27,9 @@ ...@@ -27,11 +27,9 @@
#include "vega10_smumgr.h" #include "vega10_smumgr.h"
#include "vega10_ppsmc.h" #include "vega10_ppsmc.h"
#include "smu9_driver_if.h" #include "smu9_driver_if.h"
#include "ppatomctrl.h" #include "ppatomctrl.h"
#include "pp_debug.h" #include "pp_debug.h"
#include "smu_ucode_xfer_vi.h"
#include "smu7_smumgr.h"
#define AVFS_EN_MSB 1568 #define AVFS_EN_MSB 1568
#define AVFS_EN_LSB 1568 #define AVFS_EN_LSB 1568
...@@ -383,7 +381,7 @@ static int vega10_smu_init(struct pp_hwmgr *hwmgr) ...@@ -383,7 +381,7 @@ static int vega10_smu_init(struct pp_hwmgr *hwmgr)
struct cgs_firmware_info info = {0}; struct cgs_firmware_info info = {0};
ret = cgs_get_firmware_info(hwmgr->device, ret = cgs_get_firmware_info(hwmgr->device,
smu7_convert_fw_type_to_cgs(UCODE_ID_SMU), CGS_UCODE_ID_SMU,
&info); &info);
if (ret || !info.kptr) if (ret || !info.kptr)
return -EINVAL; return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment