diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1903-drm-amd-powerplay-fix-memory-leak-in-powerplay.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1903-drm-amd-powerplay-fix-memory-leak-in-powerplay.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1903-drm-amd-powerplay-fix-memory-leak-in-powerplay.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1903-drm-amd-powerplay-fix-memory-leak-in-powerplay.patch new file mode 100644 index 00000000..8b10efe3 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1903-drm-amd-powerplay-fix-memory-leak-in-powerplay.patch @@ -0,0 +1,72 @@ +From f82508933b55ea2d2bc3359194d9baee82c7accf Mon Sep 17 00:00:00 2001 +From: Rex Zhu <Rex.Zhu@amd.com> +Date: Mon, 25 Sep 2017 17:34:00 +0800 +Subject: [PATCH 1903/4131] drm/amd/powerplay: fix memory leak in powerplay + +cgs device not free. + +Change-Id: Ib1276405a322324d8a8bb3cd25196f3d997f3b64 +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 9 ++++++--- + 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 c05e5a8..2ed81cd 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 435da26..437d785 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; +-- +2.7.4 + |