drm/msm/dpu: Remove dpu_mdss_isr when dpu_mdss_destroy is called
PATCH 1/1 drm/msm/dpu: Remove dpu_mdss_isr when dpu_mdss_destroy is called
The MDSS device is created before the MSM driver attempts to bind the sub components. If any of the components return -EPROBE_DEFER the MDSS device is destroyed and tried again later.
If this happens the "dpu_mdss_isr" interrupt created from the DPU MDSS is not freed when the MDSS device is destroyed and has a risk of triggering later and hitting a fault by accessing a mmio region that no longer exists. Even if the interrupt isn't triggered by accident when the device attempts to reprobe it would error out when it tries to re-register the interrupt so unconditionally removing it in the destroy is the right move.
Switch the device managed "dpu_mdss_isr" to be unmanaged and add a free_irq() in the mdss destroy function.
--- drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c +3 -1
@@ -158,6 +158,8 @@ static void dpu_mdss_destroy(struct drm_device *dev)_dpu_mdss_irq_domain_fini (dpu_mdss); +free_irq (platform_get_irq (pdev,0 ), dpu_mdss); +msm_dss_put_clk (mp->clk_config, mp->num_clk);devm_kfree (&pdev->dev, mp->clk_config);
@@ -215,7 +217,7 @@ int dpu_mdss_init(struct drm_device *dev)if (ret) goto irq_domain_error; - ret =devm_request_irq (dev->dev,platform_get_irq (pdev,0 ), + ret =request_irq (platform_get_irq (pdev,0 ), dpu_mdss_irq,0 ,"dpu_mdss_isr" , dpu_mdss);if (ret) {DPU_ERROR ("failed to init irq: %d\n" , ret);
Signature · 6 lines
2.18.0 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): 20180828212304.13193-1-jcrouse-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
Sean Paul
Reviewed-byQuoted 12 lines · Jordan Crouse
The MDSS device is created before the MSM driver attempts to bind the sub components. If any of the components return -EPROBE_DEFER the MDSS device is destroyed and tried again later.
If this happens the "
dpu_mdss_isr" interrupt created from the DPU MDSS is not freed when the MDSS device is destroyed and has a risk of triggering later and hitting a fault by accessing a mmio region that no longer exists. Even if the interrupt isn't triggered by accident when the device attempts to reprobe it would error out when it tries to re-register the interrupt so unconditionally removing it in the destroy is the right move.
Quoted 4 lines
Switch the device managed "
dpu_mdss_isr" to be unmanaged and add afree_irq()in the mdss destroy function.Signed-off-by Jordan Crouse <[email protected]>
Quoted 29 lines
--- drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c +3
-1@@ -158,6 +158,8 @@ static void dpu_mdss_destroy(struct drm_device *dev)_dpu_mdss_irq_domain_fini (dpu_mdss); +free_irq (platform_get_irq (pdev,0 ), dpu_mdss); +msm_dss_put_clk (mp->clk_config, mp->num_clk);devm_kfree (&pdev->dev, mp->clk_config);@@ -215,7 +217,7 @@ int dpu_mdss_init(struct drm_device *dev)if (ret) goto irq_domain_error; - ret =devm_request_irq (dev->dev,platform_get_irq (pdev,0 ), + ret =request_irq (platform_get_irq (pdev,0 ), dpu_mdss_irq,0 ,"dpu_mdss_isr" , dpu_mdss);if (ret) {DPU_ERROR ("failed to init irq: %d\n" , ret);Signature · 1 line
2.18.0
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno