Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d04f2576 authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amd/powerplay: fix memory leak in powerplay 



cgs device not free.

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 46967c22

drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c

+6 −3
Original line number Diff line number Diff line
@@ -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)

drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h

+1 −0
Original line number Diff line number Diff line
@@ -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;