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

Commit 83d857d6 authored by Leslie Shi's avatar Leslie Shi Committed by Greg Kroah-Hartman
Browse files

drm/amdgpu: fix gart.bo pin_count leak 



[ Upstream commit 66805763a97f8f7bdf742fc0851d85c02ed9411f ]

gmc_v{9,10}_0_gart_disable() isn't called matched with
correspoding gart_enbale function in SRIOV case. This will
lead to gart.bo pin_count leak on driver unload.

Cc: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarLeslie Shi <Yuliang.Shi@amd.com>
Signed-off-by: default avatarGuchun Chen <guchun.chen@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1843ae8c

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

+2 −1
Original line number Diff line number Diff line
@@ -903,6 +903,8 @@ static int gmc_v10_0_hw_fini(void *handle) 
{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	gmc_v10_0_gart_disable(adev);



	if (amdgpu_sriov_vf(adev)) {

		/* full access mode, so don't touch any GMC register */

		DRM_DEBUG("For SRIOV client, shouldn't do anything.\n");
@@ -910,7 +912,6 @@ static int gmc_v10_0_hw_fini(void *handle) 
	}



	amdgpu_irq_put(adev, &adev->gmc.vm_fault, 0);

	gmc_v10_0_gart_disable(adev);



	return 0;

}

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

+2 −1
Original line number Diff line number Diff line
@@ -1526,6 +1526,8 @@ static int gmc_v9_0_hw_fini(void *handle) 
{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	gmc_v9_0_gart_disable(adev);



	if (amdgpu_sriov_vf(adev)) {

		/* full access mode, so don't touch any GMC register */

		DRM_DEBUG("For SRIOV client, shouldn't do anything.\n");
@@ -1534,7 +1536,6 @@ static int gmc_v9_0_hw_fini(void *handle) 


	amdgpu_irq_put(adev, &adev->gmc.ecc_irq, 0);

	amdgpu_irq_put(adev, &adev->gmc.vm_fault, 0);

	gmc_v9_0_gart_disable(adev);



	return 0;

}