p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/amd/powerplay: fix memory leak in powerplay 

cgs device not free.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Rex Zhu 2017-09-25 17:34:00 +08:00 committed by Alex Deucher
parent 46967c221f
commit d04f257635
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
View File

@ -45,7 +45,7 @@ static int amdgpu_create_pp_handle(struct amdgpu_device *adev)
pp_init.chip_id = adev->asic_type; pp_init.chip_id = adev->asic_type;
pp_init.pm_en = (amdgpu_dpm != 0 && !amdgpu_sriov_vf(adev)) ? true : false; pp_init.pm_en = (amdgpu_dpm != 0 && !amdgpu_sriov_vf(adev)) ? true : false;
pp_init.feature_mask = amdgpu_pp_feature_mask; pp_init.feature_mask = amdgpu_pp_feature_mask;
pp_init.device = amdgpu_cgs_create_device(adev); pp_init.device = amd_pp->cgs_device;
ret = amd_powerplay_create(&pp_init, &(amd_pp->pp_handle)); ret = amd_powerplay_create(&pp_init, &(amd_pp->pp_handle));
if (ret) if (ret)
return -EINVAL; return -EINVAL;
@ -74,6 +74,7 @@ static int amdgpu_pp_early_init(void *handle)
case CHIP_VEGA10: case CHIP_VEGA10:
case CHIP_RAVEN: case CHIP_RAVEN:
adev->pp_enabled = true; adev->pp_enabled = true;
amd_pp->cgs_device = amdgpu_cgs_create_device(adev);
if (amdgpu_create_pp_handle(adev)) if (amdgpu_create_pp_handle(adev))
return -EINVAL; return -EINVAL;
amd_pp->ip_funcs = &pp_ip_funcs; amd_pp->ip_funcs = &pp_ip_funcs;
@ -97,7 +98,7 @@ static int amdgpu_pp_early_init(void *handle)
amd_pp->ip_funcs = &ci_dpm_ip_funcs; amd_pp->ip_funcs = &ci_dpm_ip_funcs;
amd_pp->pp_funcs = &ci_dpm_funcs; amd_pp->pp_funcs = &ci_dpm_funcs;
} else { } else {
adev->pp_enabled = true; amd_pp->cgs_device = amdgpu_cgs_create_device(adev);
if (amdgpu_create_pp_handle(adev)) if (amdgpu_create_pp_handle(adev))
return -EINVAL; return -EINVAL;
amd_pp->ip_funcs = &pp_ip_funcs; amd_pp->ip_funcs = &pp_ip_funcs;
@ -211,8 +212,10 @@ static void amdgpu_pp_late_fini(void *handle)
adev->powerplay.pp_handle); adev->powerplay.pp_handle);
if (adev->pp_enabled) if (adev->pp_enabled) {
amd_powerplay_destroy(adev->powerplay.pp_handle); amd_powerplay_destroy(adev->powerplay.pp_handle);
amdgpu_cgs_destroy_device(adev->powerplay.cgs_device);
}
} }
static int amdgpu_pp_suspend(void *handle) static int amdgpu_pp_suspend(void *handle)

1
drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h
View File

@ -268,6 +268,7 @@ struct pp_display_clock_request {
state << PP_STATE_SHIFT) state << PP_STATE_SHIFT)
struct amd_powerplay { struct amd_powerplay {
struct cgs_device *cgs_device;
void *pp_handle; void *pp_handle;
const struct amd_ip_funcs *ip_funcs; const struct amd_ip_funcs *ip_funcs;
const struct amd_pm_funcs *pp_funcs; const struct amd_pm_funcs *pp_funcs;