drm/amdgpu: invoke pm_genpd_remove() before freeing genpd

Call pm_genpd_remove() to unregister from global list prior to releasing
acp_genpd memory, and clear the pointer after free.

Signed-off-by: Ce Sun <cesun102@amd.com>
Reviewed-by: Tao Zhou <tao.zhou1@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit cd8650d7a91ee8b768e202354672553faa5cc1f2)
Cc: stable@vger.kernel.org

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
index f04b2d63c59a7420e04b3bfaf12418b2209067a4..9014678d75abff8d77d86173866af8b999f82b5d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
@@ -560,7 +560,9 @@ out:
        mfd_remove_devices(adev->acp.parent);
        kfree(adev->acp.i2s_pdata);
        kfree(adev->acp.acp_res);
+       pm_genpd_remove(&adev->acp.acp_genpd->gpd);
        kfree(adev->acp.acp_genpd);
+       adev->acp.acp_genpd = NULL;
        kfree(adev->acp.acp_cell);
 
        return ret;