summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorRobin Murphy2019-05-03 17:31:43 +0200
committerRob Herring2019-05-03 22:36:02 +0200
commitf4a3c6a44b351fc2cd79b1494606c84c46865024 (patch)
treec996f2bc9ac401dc9c4ca4b357fc5ebe5bfe7cf2 /drivers/gpu
parentdrm/panfrost: Set DMA masks earlier (diff)
downloadkernel-qcow2-linux-f4a3c6a44b351fc2cd79b1494606c84c46865024.tar.gz
kernel-qcow2-linux-f4a3c6a44b351fc2cd79b1494606c84c46865024.tar.xz
kernel-qcow2-linux-f4a3c6a44b351fc2cd79b1494606c84c46865024.zip
drm/panfrost: Disable PM on probe failure
Make sure to disable runtime PM again if probe fails after we've enabled it. Otherwise, any subsequent attempt to re-probe starts triggering "Unbalanced pm_runtime_enable!" assertions from the driver core. Signed-off-by: Robin Murphy <robin.murphy@arm.com> Signed-off-by: Rob Herring <robh@kernel.org> Link: https://patchwork.freedesktop.org/patch/msgid/2487391e7646cabbc52e9b4c20182e39d3f61859.1556195258.git.robin.murphy@arm.com
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/panfrost/panfrost_drv.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c
index 27d04bd4870a..2f5c8867fc1d 100644
--- a/drivers/gpu/drm/panfrost/panfrost_drv.c
+++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
@@ -418,6 +418,7 @@ static int panfrost_probe(struct platform_device *pdev)
err_out1:
panfrost_device_fini(pfdev);
err_out0:
+ pm_runtime_disable(pfdev->dev);
drm_dev_put(ddev);
return err;
}