drm/msm/adreno: fix runtime PM imbalance at unbind
authorJohan Hovold <johan+linaro@kernel.org>
Tue, 21 Feb 2023 10:14:27 +0000 (11:14 +0100)
committerRob Clark <robdclark@chromium.org>
Wed, 22 Feb 2023 19:22:03 +0000 (11:22 -0800)
commit6153c44392b04ff2da1e9aa82ba87da9ab9a0fc1
tree1b99ca763878b9cb2758cd3c4015c2a788823622
parent32e7083429d46f29080626fe387ff90c086b1fbe
drm/msm/adreno: fix runtime PM imbalance at unbind

A recent commit moved enabling of runtime PM from adreno_gpu_init() to
adreno_load_gpu() (called on first open()), which means that unbind()
may now be called with runtime PM disabled in case the device was never
opened in between.

Make sure to only forcibly suspend and disable runtime PM at unbind() in
case runtime PM has been enabled to prevent a disable count imbalance.

This specifically avoids leaving runtime PM disabled when the device
is later opened after a successful bind:

msm_dpu ae01000.display-controller: [drm:adreno_load_gpu [msm]] *ERROR* Couldn't power up the GPU: -13

Fixes: 4b18299b3365 ("drm/msm/adreno: Defer enabling runpm until hw_init()")
Reported-by: Bjorn Andersson <quic_bjorande@quicinc.com>
Link: https://lore.kernel.org/lkml/20230203181245.3523937-1-quic_bjorande@quicinc.com
Cc: stable@vger.kernel.org # 6.0
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Patchwork: https://patchwork.freedesktop.org/patch/523549/
Link: https://lore.kernel.org/r/20230221101430.14546-2-johan+linaro@kernel.org
Signed-off-by: Rob Clark <robdclark@chromium.org>
drivers/gpu/drm/msm/adreno/adreno_device.c