diff options
| author | Rex Zhu <Rex.Zhu@amd.com> | 2017-09-25 11:34:00 +0200 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-28 22:03:32 +0200 |
| commit | d04f257635a2f4fd74fcd7543a9337daeb40dea1 (patch) | |
| tree | eba711e0829a6929724ceeece6ad931a909a2942 | |
| parent | drm/amdgpu: move amdgpu_ucode_init_bo to amdgpu_device.c (diff) | |
| download | linux-d04f257635a2f4fd74fcd7543a9337daeb40dea1.tar.xz linux-d04f257635a2f4fd74fcd7543a9337daeb40dea1.zip | |
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>
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 9 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c index c05e5a86e7cc..2ed81cdb8320 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c @@ -45,7 +45,7 @@ static int amdgpu_create_pp_handle(struct amdgpu_device *adev) pp_init.chip_id = adev->asic_type; pp_init.pm_en = (amdgpu_dpm != 0 && !amdgpu_sriov_vf(adev)) ? true : false; 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)); if (ret) return -EINVAL; @@ -74,6 +74,7 @@ static int amdgpu_pp_early_init(void *handle) case CHIP_VEGA10: case CHIP_RAVEN: adev->pp_enabled = true; + amd_pp->cgs_device = amdgpu_cgs_create_device(adev); if (amdgpu_create_pp_handle(adev)) return -EINVAL; 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->pp_funcs = &ci_dpm_funcs; } else { - adev->pp_enabled = true; + amd_pp->cgs_device = amdgpu_cgs_create_device(adev); if (amdgpu_create_pp_handle(adev)) return -EINVAL; amd_pp->ip_funcs = &pp_ip_funcs; @@ -211,8 +212,10 @@ static void amdgpu_pp_late_fini(void *handle) adev->powerplay.pp_handle); - if (adev->pp_enabled) + if (adev->pp_enabled) { amd_powerplay_destroy(adev->powerplay.pp_handle); + amdgpu_cgs_destroy_device(adev->powerplay.cgs_device); + } } static int amdgpu_pp_suspend(void *handle) diff --git a/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h b/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h index 435da2647727..437d78558a0b 100644 --- a/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h +++ b/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h @@ -268,6 +268,7 @@ struct pp_display_clock_request { state << PP_STATE_SHIFT) struct amd_powerplay { + struct cgs_device *cgs_device; void *pp_handle; const struct amd_ip_funcs *ip_funcs; const struct amd_pm_funcs *pp_funcs; |