Re: [PATCH v3 3/9] drm/exynos: enable out_bridge in exynos_dsi_enable()

Inki Dae
2018-07-24T08:03:00Z

Hi,

2018년 06월 19일 17:19에 Maciej Purski 이(가) 쓴 글:
> As the out bridge will not be enabled directly by the framework,
> it should be enabled by DSI. Exynos_dsi_enable() should handle a case,
> when there is an out_bridge connected as a DSI peripheral.
>
> Signed-off-by: Maciej Purski <m.purski@samsung.com>
> ---
> drivers/gpu/drm/exynos/exynos_drm_dsi.c | 34 +++++++++++++++++++++------------
> 1 file changed, 22 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
> index c0408c0..8aa7ace 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
> @@ -1386,25 +1386,33 @@ static void exynos_dsi_enable(struct drm_encoder *encoder)
>
> dsi->state |= DSIM_STATE_ENABLED;
>
> - ret = drm_panel_prepare(dsi->panel);
> - if (ret < 0) {
> - dsi->state &= ~DSIM_STATE_ENABLED;
> - pm_runtime_put_sync(dsi->dev);
> - return;
> + if (dsi->panel) {
> + ret = drm_panel_prepare(dsi->panel);
> + if (ret < 0) {
> + dsi->state &= ~DSIM_STATE_ENABLED;

Why did you remove pm_runtime_put_sync call?

> + return;
> + }
> }
>
> + if (dsi->out_bridge)
> + drm_bridge_pre_enable(dsi->out_bridge);
> +
> exynos_dsi_set_display_mode(dsi);
> exynos_dsi_set_display_enable(dsi, true);
>
> - ret = drm_panel_enable(dsi->panel);
> - if (ret < 0) {
> - dsi->state &= ~DSIM_STATE_ENABLED;
> - exynos_dsi_set_display_enable(dsi, false);
> - drm_panel_unprepare(dsi->panel);
> - pm_runtime_put_sync(dsi->dev);
> - return;
> + if (dsi->panel) {
> + ret = drm_panel_enable(dsi->panel);
> + if (ret < 0) {
> + dsi->state &= ~DSIM_STATE_ENABLED;
> + exynos_dsi_set_display_enable(dsi, false);
> + drm_panel_unprepare(dsi->panel);

Ditto.

Thanks,
Inki Dae

> + return;
> + }
> }
>
> + if (dsi->out_bridge)
> + drm_bridge_enable(dsi->out_bridge);
> +
> dsi->state |= DSIM_STATE_VIDOUT_AVAILABLE;
> }
>
> @@ -1418,8 +1426,10 @@ static void exynos_dsi_disable(struct drm_encoder *encoder)
> dsi->state &= ~DSIM_STATE_VIDOUT_AVAILABLE;
>
> drm_panel_disable(dsi->panel);
> + drm_bridge_disable(dsi->out_bridge);
> exynos_dsi_set_display_enable(dsi, false);
> drm_panel_unprepare(dsi->panel);
> + drm_bridge_post_disable(dsi->out_bridge);
>
> dsi->state &= ~DSIM_STATE_ENABLED;
>
>