| Message ID | 20210927105928.v2.3.I8bb7a91ecc411d56bc155763faa15f289d7fc074@changeid (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fix Rockchip MIPI DSI display init timeouts | expand |
On Tue, Sep 28, 2021 at 2:00 AM Brian Norris <briannorris@chromium.org> wrote: > > Fix some error handling here noticed in review of other changes. > > Reported-by: Chen-Yu Tsai <wenst@chromium.org> > Signed-off-by: Brian Norris <briannorris@chromium.org> Fixes: 2d4f7bdafd70 ("drm/rockchip: dsi: migrate to use dw-mipi-dsi bridge driver") Otherwise, Reviewed-by: Chen-Yu Tsai <wenst@chromium.org> Additionally, I would move patch 2 and this patch before the first patch, as these two fix a commit introduced in v5.0, while the first patch fixes something introduced in v5.14. This would make automatic backporting cleaner. > --- > > Changes in v2: > - New > > drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c > index fa4080176719..0ed13d81fe60 100644 > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c > @@ -943,7 +943,7 @@ static int dw_mipi_dsi_rockchip_bind(struct device *dev, > ret = clk_prepare_enable(dsi->grf_clk); > if (ret) { > DRM_DEV_ERROR(dsi->dev, "Failed to enable grf_clk: %d\n", ret); > - goto out_pm_runtime; > + goto out_pll_clk; > } > > dw_mipi_dsi_rockchip_config(dsi); > @@ -955,17 +955,19 @@ static int dw_mipi_dsi_rockchip_bind(struct device *dev, > ret = rockchip_dsi_drm_create_encoder(dsi, drm_dev); > if (ret) { > DRM_DEV_ERROR(dev, "Failed to create drm encoder\n"); > - goto out_pm_runtime; > + goto out_pll_clk; > } > > ret = dw_mipi_dsi_bind(dsi->dmd, &dsi->encoder); > if (ret) { > DRM_DEV_ERROR(dev, "Failed to bind: %d\n", ret); > - goto out_pm_runtime; > + goto out_pll_clk; > } > > return 0; > > +out_pll_clk: > + clk_disable_unprepare(dsi->pllref_clk); > out_pm_runtime: > pm_runtime_put(dsi->dev); > if (dsi->slave) > -- > 2.33.0.685.g46640cef36-goog >
On Mon, Sep 27, 2021 at 9:16 PM Chen-Yu Tsai <wenst@chromium.org> wrote: > > On Tue, Sep 28, 2021 at 2:00 AM Brian Norris <briannorris@chromium.org> wrote: > > > > Fix some error handling here noticed in review of other changes. > > > > Reported-by: Chen-Yu Tsai <wenst@chromium.org> > > Signed-off-by: Brian Norris <briannorris@chromium.org> > > Fixes: 2d4f7bdafd70 ("drm/rockchip: dsi: migrate to use dw-mipi-dsi > bridge driver") > > Otherwise, > > Reviewed-by: Chen-Yu Tsai <wenst@chromium.org> I'll add these tags, thanks. > Additionally, I would move patch 2 and this patch before the first patch, > as these two fix a commit introduced in v5.0, while the first patch fixes > something introduced in v5.14. This would make automatic backporting cleaner. Personally, I prioritize putting user-visible fixes first, and more cosmetic things (like error handling that we ~never hit) later. Also, the buggy commit was already backported to all still-supported stable releases where it was relevant (i.e., 5.4+), so if these get backported, they all should. Regards, Brian [1] 43c2de1002d2 drm/rockchip: dsi: move all lane config except LCDC mux to bind()
diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c index fa4080176719..0ed13d81fe60 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c @@ -943,7 +943,7 @@ static int dw_mipi_dsi_rockchip_bind(struct device *dev, ret = clk_prepare_enable(dsi->grf_clk); if (ret) { DRM_DEV_ERROR(dsi->dev, "Failed to enable grf_clk: %d\n", ret); - goto out_pm_runtime; + goto out_pll_clk; } dw_mipi_dsi_rockchip_config(dsi); @@ -955,17 +955,19 @@ static int dw_mipi_dsi_rockchip_bind(struct device *dev, ret = rockchip_dsi_drm_create_encoder(dsi, drm_dev); if (ret) { DRM_DEV_ERROR(dev, "Failed to create drm encoder\n"); - goto out_pm_runtime; + goto out_pll_clk; } ret = dw_mipi_dsi_bind(dsi->dmd, &dsi->encoder); if (ret) { DRM_DEV_ERROR(dev, "Failed to bind: %d\n", ret); - goto out_pm_runtime; + goto out_pll_clk; } return 0; +out_pll_clk: + clk_disable_unprepare(dsi->pllref_clk); out_pm_runtime: pm_runtime_put(dsi->dev); if (dsi->slave)
Fix some error handling here noticed in review of other changes. Reported-by: Chen-Yu Tsai <wenst@chromium.org> Signed-off-by: Brian Norris <briannorris@chromium.org> --- Changes in v2: - New drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)