Skip to content

Commit 23db86e

Browse files
fabioestevamintel-lab-lkp
authored andcommitted
drm/msm: Fix suspend/resume on i.MX5
When putting iMX5 into suspend, the following flow is observed: [ 70.023427] [<c07755f0>] (msm_atomic_commit_tail) from [<c06e7218>] (commit_tail+0x9c/0x18c) [ 70.031890] [<c06e7218>] (commit_tail) from [<c0e2920c>] (drm_atomic_helper_commit+0x1a0/0x1d4) [ 70.040627] [<c0e2920c>] (drm_atomic_helper_commit) from [<c06e74d4>] (drm_atomic_helper_disable_all+0x1c4/0x1d4) [ 70.050913] [<c06e74d4>] (drm_atomic_helper_disable_all) from [<c0e2943c>] (drm_atomic_helper_suspend+0xb8/0x170) [ 70.061198] [<c0e2943c>] (drm_atomic_helper_suspend) from [<c06e84bc>] (drm_mode_config_helper_suspend+0x24/0x58) In the i.MX5 case, priv->kms is not populated (as i.MX5 does not use any of the Qualcomm display controllers), causing a NULL pointer dereference in msm_atomic_commit_tail(): [ 24.268964] 8<--- cut here --- [ 24.274602] Unable to handle kernel NULL pointer dereference at virtual address 00000000 [ 24.283434] pgd = (ptrval) [ 24.286387] [00000000] *pgd=ca212831 [ 24.290788] Internal error: Oops: 17 [#1] SMP ARM [ 24.295609] Modules linked in: [ 24.298777] CPU: 0 PID: 197 Comm: init Not tainted 5.11.0-rc2-next-20210111 torvalds#333 [ 24.306276] Hardware name: Freescale i.MX53 (Device Tree Support) [ 24.312442] PC is at msm_atomic_commit_tail+0x54/0xb9c [ 24.317743] LR is at commit_tail+0xa4/0x1b0 Fix the problem by calling drm_mode_config_helper_suspend/resume() only when priv->kms is available. Fixes: ca8199f ("drm/msm/dpu: ensure device suspend happens during PM sleep") Signed-off-by: Fabio Estevam <[email protected]>
1 parent d40a2b3 commit 23db86e

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

drivers/gpu/drm/msm/msm_drv.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,13 +1072,21 @@ static int __maybe_unused msm_pm_resume(struct device *dev)
10721072
static int __maybe_unused msm_pm_prepare(struct device *dev)
10731073
{
10741074
struct drm_device *ddev = dev_get_drvdata(dev);
1075+
struct msm_drm_private *priv = ddev ? ddev->dev_private : NULL;
1076+
1077+
if (!priv || !priv->kms)
1078+
return 0;
10751079

10761080
return drm_mode_config_helper_suspend(ddev);
10771081
}
10781082

10791083
static void __maybe_unused msm_pm_complete(struct device *dev)
10801084
{
10811085
struct drm_device *ddev = dev_get_drvdata(dev);
1086+
struct msm_drm_private *priv = ddev ? ddev->dev_private : NULL;
1087+
1088+
if (!priv || !priv->kms)
1089+
return;
10821090

10831091
drm_mode_config_helper_resume(ddev);
10841092
}

0 commit comments

Comments
 (0)