Commit 54199009 authored by Douglas Anderson's avatar Douglas Anderson Committed by Dmitry Baryshkov
Browse files

drm/msm: Fix shutdown 



When rebooting on my sc7280-herobrine based device, I got a
crash. Upon debugging, I found that I was in msm_drv_shutdown() and my
"pdev" was the one associated with mdss_probe().

From source, I found that mdss_probe() has the line:
  platform_set_drvdata(pdev, mdss);
...where "mdss" is of type "struct msm_mdss *".

Also from source, I saw that in msm_drv_shutdown() we have the line:
  struct msm_drm_private *priv = platform_get_drvdata(pdev);

This is a mismatch and is the root of the problem.

Further digging made it apparent that msm_drv_shutdown() is only
supposed to be used for parts of the msm display framework that also
call msm_drv_probe() but mdss_probe() doesn't call
msm_drv_probe(). Let's remove the shutdown functon from msm_mdss.c.

Digging a little further, code inspection found that two drivers that
use msm_drv_probe() weren't calling msm_drv_shutdown(). Let's add it
to them.

Fixes: 6874f48b ("drm/msm: make mdp5/dpu devices master components")
Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/484975/
Link: https://lore.kernel.org/r/20220504163900.v2.1.Iaebd35e60160fc0f2a50fac3a0bf3b298c0637c8@changeid


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent cf575e31

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c

+1 −0
Original line number Diff line number Diff line
@@ -1350,6 +1350,7 @@ MODULE_DEVICE_TABLE(of, dpu_dt_match); 
static struct platform_driver dpu_driver = {

	.probe = dpu_dev_probe,

	.remove = dpu_dev_remove,

	.shutdown = msm_drv_shutdown,

	.driver = {

		.name = "msm_dpu",

		.of_match_table = dpu_dt_match,

drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c

+1 −0
Original line number Diff line number Diff line
@@ -1009,6 +1009,7 @@ MODULE_DEVICE_TABLE(of, mdp5_dt_match); 
static struct platform_driver mdp5_driver = {

	.probe = mdp5_dev_probe,

	.remove = mdp5_dev_remove,

	.shutdown = msm_drv_shutdown,

	.driver = {

		.name = "msm_mdp",

		.of_match_table = mdp5_dt_match,

drivers/gpu/drm/msm/msm_mdss.c

+0 −1
Original line number Diff line number Diff line
@@ -397,7 +397,6 @@ MODULE_DEVICE_TABLE(of, mdss_dt_match); 
static struct platform_driver mdss_platform_driver = {

	.probe      = mdss_probe,

	.remove     = mdss_remove,

	.shutdown   = msm_drv_shutdown,

	.driver     = {

		.name   = "msm-mdss",

		.of_match_table = mdss_dt_match,