The runtime suspend and resume callbacks for the DSI, HDMI4, HDMI5 and VENC try to manage the runtime PM state of the DISPC, which can be unavailable at probe time (due to the DSS probe being deferred for instance) and remove time (due to the DISPC being removed already). The proper fix is to move DISPC runtime PM handling out of the encoders runtime PM handlers, but that will require more development and testing that would be reasonable for an -rc bug fix.
Fixes: edb715dffdee ("drm/omap: dss: dsi: Move initialization code from bind to probe") Signed-off-by: Laurent Pinchart laurent.pinchart@ideasonboard.com --- drivers/gpu/drm/omapdrm/dss/dsi.c | 22 ++++++++++++++++++---- drivers/gpu/drm/omapdrm/dss/hdmi4.c | 19 +++++++++++++++---- drivers/gpu/drm/omapdrm/dss/hdmi5.c | 19 +++++++++++++++---- drivers/gpu/drm/omapdrm/dss/venc.c | 19 +++++++++++++++---- 4 files changed, 63 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index b9d5ad7e67d8..a1b9e6659b1e 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -5473,7 +5473,12 @@ static int dsi_runtime_suspend(struct device *dev) /* wait for current handler to finish before turning the DSI off */ synchronize_irq(dsi->irq);
- dispc_runtime_put(dsi->dss->dispc); + /* + * FIXME: DISPC runtime PM handling should be controlled from omapdrm, + * see dsi_runtime_resume(). + */ + if (dsi->dss && dsi->dss->dispc) + dispc_runtime_put(dsi->dss->dispc);
return 0; } @@ -5483,9 +5488,18 @@ static int dsi_runtime_resume(struct device *dev) struct dsi_data *dsi = dev_get_drvdata(dev); int r;
- r = dispc_runtime_get(dsi->dss->dispc); - if (r) - return r; + /* + * FIXME: The device is resumed from the probe function before the dss + * is available, in order to read a hardware configuration register. + * This doesn't require resuming the DISPC, so make it conditional. The + * DISPC runtime PM handling should instead be controlled from omapdrm, + * which is already partly the case, but needs additional testing. + */ + if (dsi->dss && dsi->dss->dispc) { + r = dispc_runtime_get(dsi->dss->dispc); + if (r) + return r; + }
dsi->is_enabled = true; /* ensure the irq handler sees the is_enabled value */ diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c index 36be9a36d664..21d1147c0827 100644 --- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c +++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c @@ -845,7 +845,12 @@ static int hdmi_runtime_suspend(struct device *dev) { struct omap_hdmi *hdmi = dev_get_drvdata(dev);
- dispc_runtime_put(hdmi->dss->dispc); + /* + * FIXME: DISPC runtime PM handling should be controlled from omapdrm, + * see dsi_runtime_resume(). + */ + if (hdmi->dss && hdmi->dss->dispc) + dispc_runtime_put(hdmi->dss->dispc);
return 0; } @@ -855,9 +860,15 @@ static int hdmi_runtime_resume(struct device *dev) struct omap_hdmi *hdmi = dev_get_drvdata(dev); int r;
- r = dispc_runtime_get(hdmi->dss->dispc); - if (r < 0) - return r; + /* + * FIXME: DISPC runtime PM handling should be controlled from omapdrm, + * see dsi_runtime_resume(). + */ + if (hdmi->dss && hdmi->dss->dispc) { + r = dispc_runtime_get(hdmi->dss->dispc); + if (r < 0) + return r; + }
return 0; } diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c index b0e4a7463f8c..75e2cb74a66c 100644 --- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c +++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c @@ -829,7 +829,12 @@ static int hdmi_runtime_suspend(struct device *dev) { struct omap_hdmi *hdmi = dev_get_drvdata(dev);
- dispc_runtime_put(hdmi->dss->dispc); + /* + * FIXME: DISPC runtime PM handling should be controlled from omapdrm, + * see dsi_runtime_resume(). + */ + if (hdmi->dss && hdmi->dss->dispc) + dispc_runtime_put(hdmi->dss->dispc);
return 0; } @@ -839,9 +844,15 @@ static int hdmi_runtime_resume(struct device *dev) struct omap_hdmi *hdmi = dev_get_drvdata(dev); int r;
- r = dispc_runtime_get(hdmi->dss->dispc); - if (r < 0) - return r; + /* + * FIXME: DISPC runtime PM handling should be controlled from omapdrm, + * see dsi_runtime_resume(). + */ + if (hdmi->dss && hdmi->dss->dispc) { + r = dispc_runtime_get(hdmi->dss->dispc); + if (r < 0) + return r; + }
return 0; } diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c index ff0b18c8e4ac..c39ad81fbc54 100644 --- a/drivers/gpu/drm/omapdrm/dss/venc.c +++ b/drivers/gpu/drm/omapdrm/dss/venc.c @@ -946,7 +946,12 @@ static int venc_runtime_suspend(struct device *dev) if (venc->tv_dac_clk) clk_disable_unprepare(venc->tv_dac_clk);
- dispc_runtime_put(venc->dss->dispc); + /* + * FIXME: DISPC runtime PM handling should be controlled from omapdrm, + * see dsi_runtime_resume(). + */ + if (venc->dss && venc->dss->dispc) + dispc_runtime_put(venc->dss->dispc);
return 0; } @@ -956,9 +961,15 @@ static int venc_runtime_resume(struct device *dev) struct venc_device *venc = dev_get_drvdata(dev); int r;
- r = dispc_runtime_get(venc->dss->dispc); - if (r < 0) - return r; + /* + * FIXME: DISPC runtime PM handling should be controlled from omapdrm, + * see dsi_runtime_resume(). + */ + if (venc->dss && venc->dss->dispc) { + r = dispc_runtime_get(venc->dss->dispc); + if (r < 0) + return r; + }
if (venc->tv_dac_clk) clk_prepare_enable(venc->tv_dac_clk);