提交 075f101c 编写于 作者: R Rex Zhu 提交者: Alex Deucher

drm/amd/powerplay: simplify struct amd_pp_init.

delete the members not needed when amd_powerplay_init.
Signed-off-by: NRex Zhu <Rex.Zhu@amd.com>
Reviewed-by: NAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
上级 38109efa
...@@ -52,10 +52,6 @@ static int amdgpu_powerplay_init(struct amdgpu_device *adev) ...@@ -52,10 +52,6 @@ static int amdgpu_powerplay_init(struct amdgpu_device *adev)
pp_init->chip_family = adev->family; pp_init->chip_family = adev->family;
pp_init->chip_id = adev->asic_type; pp_init->chip_id = adev->asic_type;
pp_init->device = amdgpu_cgs_create_device(adev); pp_init->device = amdgpu_cgs_create_device(adev);
pp_init->rev_id = adev->pdev->revision;
pp_init->sub_sys_id = adev->pdev->subsystem_device;
pp_init->sub_vendor_id = adev->pdev->subsystem_vendor;
ret = amd_powerplay_init(pp_init, amd_pp); ret = amd_powerplay_init(pp_init, amd_pp);
kfree(pp_init); kfree(pp_init);
#endif #endif
......
...@@ -76,9 +76,6 @@ int hwmgr_init(struct amd_pp_init *pp_init, struct pp_instance *handle) ...@@ -76,9 +76,6 @@ int hwmgr_init(struct amd_pp_init *pp_init, struct pp_instance *handle)
hwmgr->device = pp_init->device; hwmgr->device = pp_init->device;
hwmgr->chip_family = pp_init->chip_family; hwmgr->chip_family = pp_init->chip_family;
hwmgr->chip_id = pp_init->chip_id; hwmgr->chip_id = pp_init->chip_id;
hwmgr->hw_revision = pp_init->rev_id;
hwmgr->sub_sys_id = pp_init->sub_sys_id;
hwmgr->sub_vendor_id = pp_init->sub_vendor_id;
hwmgr->usec_timeout = AMD_MAX_USEC_TIMEOUT; hwmgr->usec_timeout = AMD_MAX_USEC_TIMEOUT;
hwmgr->power_source = PP_PowerSource_AC; hwmgr->power_source = PP_PowerSource_AC;
......
...@@ -131,9 +131,6 @@ struct amd_pp_init { ...@@ -131,9 +131,6 @@ struct amd_pp_init {
struct cgs_device *device; struct cgs_device *device;
uint32_t chip_family; uint32_t chip_family;
uint32_t chip_id; uint32_t chip_id;
uint32_t rev_id;
uint16_t sub_sys_id;
uint16_t sub_vendor_id;
}; };
enum amd_pp_display_config_type{ enum amd_pp_display_config_type{
......
...@@ -579,9 +579,6 @@ struct phm_microcode_version_info { ...@@ -579,9 +579,6 @@ struct phm_microcode_version_info {
struct pp_hwmgr { struct pp_hwmgr {
uint32_t chip_family; uint32_t chip_family;
uint32_t chip_id; uint32_t chip_id;
uint32_t hw_revision;
uint32_t sub_sys_id;
uint32_t sub_vendor_id;
void *device; void *device;
struct pp_smumgr *smumgr; struct pp_smumgr *smumgr;
......
...@@ -74,7 +74,6 @@ struct pp_smumgr_func { ...@@ -74,7 +74,6 @@ struct pp_smumgr_func {
struct pp_smumgr { struct pp_smumgr {
uint32_t chip_family; uint32_t chip_family;
uint32_t chip_id; uint32_t chip_id;
uint32_t hw_revision;
void *device; void *device;
void *backend; void *backend;
uint32_t usec_timeout; uint32_t usec_timeout;
......
...@@ -48,7 +48,6 @@ int smum_init(struct amd_pp_init *pp_init, struct pp_instance *handle) ...@@ -48,7 +48,6 @@ int smum_init(struct amd_pp_init *pp_init, struct pp_instance *handle)
smumgr->device = pp_init->device; smumgr->device = pp_init->device;
smumgr->chip_family = pp_init->chip_family; smumgr->chip_family = pp_init->chip_family;
smumgr->chip_id = pp_init->chip_id; smumgr->chip_id = pp_init->chip_id;
smumgr->hw_revision = pp_init->rev_id;
smumgr->usec_timeout = AMD_MAX_USEC_TIMEOUT; smumgr->usec_timeout = AMD_MAX_USEC_TIMEOUT;
smumgr->reload_fw = 1; smumgr->reload_fw = 1;
handle->smu_mgr = smumgr; handle->smu_mgr = smumgr;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册