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

Commit 594726c9 authored by Jonathan Marek's avatar Jonathan Marek Committed by Greg Kroah-Hartman
Browse files

drm/msm: fix unbalanced pm_runtime_enable in adreno_gpu_{init, cleanup} 



[ Upstream commit 17e822f7591fb66162aca07685dc0b01468e5480 ]

adreno_gpu_init calls pm_runtime_enable, so adreno_gpu_cleanup needs to
call pm_runtime_disable.

Signed-off-by: default avatarJonathan Marek <jonathan@marek.ca>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Stable-dep-of: db7662d076c9 ("drm/msm/adreno: drop bogus pm_runtime_set_active()")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 37c8085c

drivers/gpu/drm/msm/adreno/adreno_gpu.c

+3 −0
Original line number Diff line number Diff line
@@ -908,11 +908,14 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, 
void adreno_gpu_cleanup(struct adreno_gpu *adreno_gpu)

{

	struct msm_gpu *gpu = &adreno_gpu->base;

	struct msm_drm_private *priv = gpu->dev->dev_private;

	unsigned int i;



	for (i = 0; i < ARRAY_SIZE(adreno_gpu->info->fw); i++)

		release_firmware(adreno_gpu->fw[i]);



	pm_runtime_disable(&priv->gpu_pdev->dev);



	icc_put(gpu->icc_path);



	msm_gpu_cleanup(&adreno_gpu->base);