drm/msm: Call shutdown conditionally
Subsystems (3)
PATCH v2 1/2 drm/msm: Call shutdown conditionally
Issuing a 'reboot' command in i.MX5 leads to the following flow:
[ 24.557742] [<c0769b78>] (msm_atomic_commit_tail) from [<c06db0b4>] (commit_tail+0xa4/0x1b0) [ 24.566349] [<c06db0b4>] (commit_tail) from [<c06dbed0>] (drm_atomic_helper_commit+0x154/0x188) [ 24.575193] [<c06dbed0>] (drm_atomic_helper_commit) from [<c06db604>] (drm_atomic_helper_disable_all+0x154/0x1c0) [ 24.585599] [<c06db604>] (drm_atomic_helper_disable_all) from [<c06db704>] (drm_atomic_helper_shutdown+0x94/0x12c) [ 24.596094] [<c06db704>] (drm_atomic_helper_shutdown) from
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 #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_atomic_helper_shutdown() conditionally.
---
Changes since v1:
- Explain in the commit log that the problem happens after a 'reboot' command.
drivers/gpu/drm/msm/msm_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_drv.c +2 -1
@@ -1311,7 +1311,8 @@ static void msm_pdev_shutdown(struct platform_device *pdev) {struct drm_device *drm =platform_get_drvdata (pdev); -drm_atomic_helper_shutdown (drm); +if (get_mdp_ver (pdev)) +drm_atomic_helper_shutdown (drm); }static const struct of_device_id dt_match[] = {
Signature · 6 lines
2.25.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 2/2 drm/msm: Call suspend/resume conditionally
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 #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() conditionally.
---
Changes since v1:
- Newly introduced in this series.
drivers/gpu/drm/msm/msm_drv.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/msm_drv.c +5 -2
@@ -1072,14 +1072,17 @@ static int __maybe_unused msm_pm_prepare(struct device *dev) {struct drm_device *ddev =dev_get_drvdata (dev); -return drm_mode_config_helper_suspend (ddev); +if (of_device_get_match_data (dev)) +return drm_mode_config_helper_suspend (ddev); +return 0 ; }static void __maybe_unused msm_pm_complete (struct device *dev) {struct drm_device *ddev =dev_get_drvdata (dev); -drm_mode_config_helper_resume (ddev); +if (of_device_get_match_data (dev)) +drm_mode_config_helper_resume (ddev); }static const struct dev_pm_ops msm_pm_ops = {
Signature · 6 lines
2.25.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi Rob,
Any comments on this series, please?
Quoted 57 lines · Fabio Estevam
Issuing a 'reboot' command in i.MX5 leads to the following flow:
[ 24.557742] [<c0769b78>] (msm_atomic_commit_tail) from [<c06db0b4>] (commit_tail+0xa4/0x1b0) [ 24.566349] [<c06db0b4>] (commit_tail) from [<c06dbed0>] (drm_atomic_helper_commit+0x154/0x188) [ 24.575193] [<c06dbed0>] (drm_atomic_helper_commit) from [<c06db604>] (drm_atomic_helper_disable_all+0x154/0x1c0) [ 24.585599] [<c06db604>] (drm_atomic_helper_disable_all) from [<c06db704>] (drm_atomic_helper_shutdown+0x94/0x12c) [ 24.596094] [<c06db704>] (drm_atomic_helper_shutdown) fromIn the i.MX5 case,
priv->kmsis not populated (as i.MX5 does not use any of the Qualcomm display controllers), causing a NULL pointer dereference inmsm_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 #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/0x1b0Fix the problem by calling
drm_atomic_helper_shutdown()conditionally.Cc <[email protected]>Fixes 9d5cbf5fe46e ("drm/msm: add shutdown support for display platform_driver")Suggested-by Rob Clark <[email protected]>Signed-off-by Fabio Estevam <[email protected]>---
Changes since v1:
- Explain in the commit log that the problem happens after a 'reboot' command.drivers/gpu/drm/msm/msm_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/msm/msm_drv.c +2
-2@@ -1311,7 +1311,8 @@ static void msm_pdev_shutdown(struct platform_device *pdev) {struct drm_device *drm =platform_get_drvdata (pdev); -drm_atomic_helper_shutdown (drm); +if (get_mdp_ver (pdev)) +drm_atomic_helper_shutdown (drm); }static const struct of_device_id dt_match[] = { --
Quoted 2 lines
2.25.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gentle ping...
Quoted 61 lines · Fabio Estevam
Hi Rob,
Any comments on this series, please?
Quoted 55 lines · Fabio Estevam
Issuing a 'reboot' command in i.MX5 leads to the following flow:
[ 24.557742] [<c0769b78>] (msm_atomic_commit_tail) from [<c06db0b4>] (commit_tail+0xa4/0x1b0) [ 24.566349] [<c06db0b4>] (commit_tail) from [<c06dbed0>] (drm_atomic_helper_commit+0x154/0x188) [ 24.575193] [<c06dbed0>] (drm_atomic_helper_commit) from [<c06db604>] (drm_atomic_helper_disable_all+0x154/0x1c0) [ 24.585599] [<c06db604>] (drm_atomic_helper_disable_all) from [<c06db704>] (drm_atomic_helper_shutdown+0x94/0x12c) [ 24.596094] [<c06db704>] (drm_atomic_helper_shutdown) fromIn the i.MX5 case,
priv->kmsis not populated (as i.MX5 does not use any of the Qualcomm display controllers), causing a NULL pointer dereference inmsm_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 #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/0x1b0Fix the problem by calling
drm_atomic_helper_shutdown()conditionally.Cc <[email protected]>Fixes 9d5cbf5fe46e ("drm/msm: add shutdown support for display platform_driver")Suggested-by Rob Clark <[email protected]>Signed-off-by Fabio Estevam <[email protected]>---
Changes since v1:
- Explain in the commit log that the problem happens after a 'reboot' command.drivers/gpu/drm/msm/msm_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/msm/msm_drv.c +2
-1@@ -1311,7 +1311,8 @@ static void msm_pdev_shutdown(struct platform_device *pdev) {struct drm_device *drm =platform_get_drvdata (pdev); -drm_atomic_helper_shutdown (drm); +if (get_mdp_ver (pdev)) +drm_atomic_helper_shutdown (drm); }
Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/msm/msm_drv.c +0
-1static const struct of_device_id dt_match[] = { --2.25.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel