]> git.itanic.dy.fi Git - linux-stable/commit
drm/msm/adreno: fix runtime PM imbalance at gpu load
authorJohan Hovold <johan+linaro@kernel.org>
Fri, 3 Mar 2023 16:48:05 +0000 (17:48 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 May 2023 09:50:27 +0000 (11:50 +0200)
commitbf16debcda5c6485a1744f30b054d491f350a42b
treedbf3f0308283780357e9487c2439792fc7165bac
parentbac00e57cd5e56ffd9a3a0045809b40da58dbcc4
drm/msm/adreno: fix runtime PM imbalance at gpu load

[ Upstream commit 0d997f95b70f98987ae031a89677c13e0e223670 ]

A recent commit moved enabling of runtime PM to GPU load time (first
open()) but failed to update the error paths so that runtime PM is
disabled if initialisation of the GPU fails. This would trigger a
warning about the unbalanced disable count on the next open() attempt.

Note that pm_runtime_put_noidle() is sufficient to balance the usage
count when pm_runtime_put_sync() fails (and is chosen over
pm_runtime_resume_and_get() for consistency reasons).

Fixes: 4b18299b3365 ("drm/msm/adreno: Defer enabling runpm until hw_init()")
Cc: stable@vger.kernel.org # 6.0
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Patchwork: https://patchwork.freedesktop.org/patch/524971/
Link: https://lore.kernel.org/r/20230303164807.13124-3-johan+linaro@kernel.org
Signed-off-by: Rob Clark <robdclark@chromium.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/msm/adreno/adreno_device.c