[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <67a91eca-a116-7db8-f905-25750d8bf4b6@linaro.org>
Date: Thu, 12 May 2022 02:25:02 +0300
From: Dmitry Baryshkov <dmitry.baryshkov@...aro.org>
To: Douglas Anderson <dianders@...omium.org>,
Rob Clark <robdclark@...il.com>,
Abhinav Kumar <quic_abhinavk@...cinc.com>
Cc: Dave Stevenson <dave.stevenson@...pberrypi.com>,
Bjorn Andersson <bjorn.andersson@...aro.org>,
Daniel Vetter <daniel@...ll.ch>,
David Airlie <airlied@...ux.ie>, Sean Paul <sean@...rly.run>,
Stephen Boyd <swboyd@...omium.org>,
Vinod Koul <vkoul@...nel.org>, dri-devel@...ts.freedesktop.org,
freedreno@...ts.freedesktop.org, linux-arm-msm@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2] Revert "drm/msm/dsi: move DSI host powerup to modeset
time"
On 12/05/2022 02:15, Douglas Anderson wrote:
> This reverts commit 7d8e9a90509f1bd1d193a0c93cb8d1dbad9049fb.
>
> The patch causes sc7180 Chromebooks that use the parade-ps8640 bridge
> chip to fail to turn the display back on after it turns off.
>
> Let's revert to get these devices back to a working state. It seems
> like the DSI powerup problem is somewhat common and probably we should
> land something more general like Dave Stevenson's series [1] that
> would give more flexibility.
>
> [1] https://lore.kernel.org/r/cover.1646406653.git.dave.stevenson@raspberrypi.com
>
> Fixes: 7d8e9a90509f ("drm/msm/dsi: move DSI host powerup to modeset time")
> Signed-off-by: Douglas Anderson <dianders@...omium.org>
> ---
>
> Changes in v2:
> - Remove the mud from my face.
As stated, I'm for this revert, but after getting the mentioned patchset
in. Will that work for you? If not, I'd prefer to land a patch adding
modparam to powerup the DSI during the mode_set or during the pre_enabel().
>
> drivers/gpu/drm/msm/dsi/dsi_manager.c | 43 ++++++++-------------------
> 1 file changed, 12 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c
> index 50b987658b1f..8d51711a3417 100644
> --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c
> +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c
> @@ -315,12 +315,13 @@ dsi_mgr_connector_best_encoder(struct drm_connector *connector)
> return msm_dsi_get_encoder(msm_dsi);
> }
>
> -static void dsi_mgr_bridge_power_on(struct drm_bridge *bridge)
> +static void dsi_mgr_bridge_pre_enable(struct drm_bridge *bridge)
> {
> int id = dsi_mgr_bridge_get_id(bridge);
> struct msm_dsi *msm_dsi = dsi_mgr_get_dsi(id);
> struct msm_dsi *msm_dsi1 = dsi_mgr_get_dsi(DSI_1);
> struct mipi_dsi_host *host = msm_dsi->host;
> + struct drm_panel *panel = msm_dsi->panel;
> struct msm_dsi_phy_shared_timings phy_shared_timings[DSI_MAX];
> bool is_bonded_dsi = IS_BONDED_DSI();
> int ret;
> @@ -361,34 +362,6 @@ static void dsi_mgr_bridge_power_on(struct drm_bridge *bridge)
> if (is_bonded_dsi && msm_dsi1)
> msm_dsi_host_enable_irq(msm_dsi1->host);
>
> - return;
> -
> -host1_on_fail:
> - msm_dsi_host_power_off(host);
> -host_on_fail:
> - dsi_mgr_phy_disable(id);
> -phy_en_fail:
> - return;
> -}
> -
> -static void dsi_mgr_bridge_pre_enable(struct drm_bridge *bridge)
> -{
> - int id = dsi_mgr_bridge_get_id(bridge);
> - struct msm_dsi *msm_dsi = dsi_mgr_get_dsi(id);
> - struct msm_dsi *msm_dsi1 = dsi_mgr_get_dsi(DSI_1);
> - struct mipi_dsi_host *host = msm_dsi->host;
> - struct drm_panel *panel = msm_dsi->panel;
> - bool is_bonded_dsi = IS_BONDED_DSI();
> - int ret;
> -
> - DBG("id=%d", id);
> - if (!msm_dsi_device_connected(msm_dsi))
> - return;
> -
> - /* Do nothing with the host if it is slave-DSI in case of bonded DSI */
> - if (is_bonded_dsi && !IS_MASTER_DSI_LINK(id))
> - return;
> -
> /* Always call panel functions once, because even for dual panels,
> * there is only one drm_panel instance.
> */
> @@ -423,7 +396,17 @@ static void dsi_mgr_bridge_pre_enable(struct drm_bridge *bridge)
> if (panel)
> drm_panel_unprepare(panel);
> panel_prep_fail:
> + msm_dsi_host_disable_irq(host);
> + if (is_bonded_dsi && msm_dsi1)
> + msm_dsi_host_disable_irq(msm_dsi1->host);
>
> + if (is_bonded_dsi && msm_dsi1)
> + msm_dsi_host_power_off(msm_dsi1->host);
> +host1_on_fail:
> + msm_dsi_host_power_off(host);
> +host_on_fail:
> + dsi_mgr_phy_disable(id);
> +phy_en_fail:
> return;
> }
>
> @@ -569,8 +552,6 @@ static void dsi_mgr_bridge_mode_set(struct drm_bridge *bridge,
> msm_dsi_host_set_display_mode(host, adjusted_mode);
> if (is_bonded_dsi && other_dsi)
> msm_dsi_host_set_display_mode(other_dsi->host, adjusted_mode);
> -
> - dsi_mgr_bridge_power_on(bridge);
> }
>
> static enum drm_mode_status dsi_mgr_bridge_mode_valid(struct drm_bridge *bridge,
--
With best wishes
Dmitry
Powered by blists - more mailing lists