From: Jonathan Marek <jonathan@marek.ca> Date: Mon, 13 Jul 2020 22:53:40 +0000 (-0400) Subject: drm/msm: fix unbalanced pm_runtime_enable in adreno_gpu_{init, cleanup} X-Git-Tag: baikal/mips/sdk5.9~13005^2^2~36 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=bc038d79801afc34a4a01b46e9e5487acabba99c;p=kernel.git drm/msm: fix unbalanced pm_runtime_enable in adreno_gpu_{init, cleanup} adreno_gpu_init calls pm_runtime_enable, so adreno_gpu_cleanup needs to call pm_runtime_disable. Signed-off-by: Jonathan Marek <jonathan@marek.ca> Signed-off-by: Rob Clark <robdclark@chromium.org> --- diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index 5db06b5909438..9f218beff8acd 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -1021,11 +1021,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); icc_put(gpu->ocmem_icc_path);