LKML Archive on lore.kernel.org help / color / mirror / Atom feed
From: Enric Balletbo i Serra <enric.balletbo@collabora.com> To: architt@codeaurora.org, inki.dae@samsung.com, thierry.reding@gmail.com, hjc@rock-chips.com, seanpaul@chromium.org, airlied@linux.ie, tfiga@chromium.org, heiko@sntech.de Cc: dri-devel@lists.freedesktop.org, dianders@chromium.org, a.hajda@samsung.com, kernel@collabora.com, m.szyprowski@samsung.com, linux-samsung-soc@vger.kernel.org, jy0922.shim@samsung.com, rydberg@bitmath.org, krzk@kernel.org, linux-rockchip@lists.infradead.org, kgene@kernel.org, orjan.eide@arm.com, wxt@rock-chips.com, jeffy.chen@rock-chips.com, linux-arm-kernel@lists.infradead.org, wzz@rock-chips.com, hl@rock-chips.com, jingoohan1@gmail.com, sw0312.kim@samsung.com, linux-kernel@vger.kernel.org, kyungmin.park@samsung.com, Laurent.pinchart@ideasonboard.com, kuankuan.y@gmail.com, hshi@chromium.org, Enric Balletbo i Serra <enric.balletbo@collabora.com> Subject: [RESEND PATCH v6 23/27] drm/rockchip: analogix_dp: Do not call Analogix code before bind Date: Mon, 23 Apr 2018 12:49:59 +0200 [thread overview] Message-ID: <20180423105003.9004-24-enric.balletbo@collabora.com> (raw) In-Reply-To: <20180423105003.9004-1-enric.balletbo@collabora.com> From: Tomasz Figa <tfiga@chromium.org> Driver callbacks, such as system suspend or resume can be called any time, specifically they can be called before the component bind callback. Let's use dp->adp pointer as a safeguard and skip calling Analogix entry points if it is an ERR_PTR(). Signed-off-by: Tomasz Figa <tfiga@chromium.org> Signed-off-by: Thierry Escande <thierry.escande@collabora.com> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> Reviewed-by: Archit Taneja <architt@codeaurora.org> --- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c index 23317a2269e1..6d45d62466b3 100644 --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c @@ -368,6 +368,8 @@ static void rockchip_dp_unbind(struct device *dev, struct device *master, analogix_dp_unbind(dp->adp); rockchip_drm_psr_unregister(&dp->encoder); dp->encoder.funcs->destroy(&dp->encoder); + + dp->adp = ERR_PTR(-ENODEV); } static const struct component_ops rockchip_dp_component_ops = { @@ -391,6 +393,7 @@ static int rockchip_dp_probe(struct platform_device *pdev) return -ENOMEM; dp->dev = dev; + dp->adp = ERR_PTR(-ENODEV); dp->plat_data.panel = panel; ret = rockchip_dp_of_probe(dp); @@ -414,6 +417,9 @@ static int rockchip_dp_suspend(struct device *dev) { struct rockchip_dp_device *dp = dev_get_drvdata(dev); + if (IS_ERR(dp->adp)) + return 0; + return analogix_dp_suspend(dp->adp); } @@ -421,6 +427,9 @@ static int rockchip_dp_resume(struct device *dev) { struct rockchip_dp_device *dp = dev_get_drvdata(dev); + if (IS_ERR(dp->adp)) + return 0; + return analogix_dp_resume(dp->adp); } #endif -- 2.17.0
next prev parent reply other threads:[~2018-04-23 10:53 UTC|newest] Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <CGME20180423105022epcas3p442289343ea272f0722802b4746871fba@epcas3p4.samsung.com> 2018-04-23 10:49 ` [RESEND PATCH v6 00/27] DRM Rockchip rk3399 (Kevin) Enric Balletbo i Serra 2018-04-23 10:49 ` [RESEND PATCH v6 01/27] drm/bridge: analogix_dp: Move enable video into config_video() Enric Balletbo i Serra 2018-04-23 10:49 ` [RESEND PATCH v6 02/27] drm/bridge: analogix_dp: Check AUX_EN status when doing AUX transfer Enric Balletbo i Serra 2018-04-23 10:49 ` [RESEND PATCH v6 03/27] drm/bridge: analogix_dp: Don't use fast link training when panel just powered up Enric Balletbo i Serra 2018-04-23 10:49 ` [RESEND PATCH v6 04/27] drm/bridge: analogix_dp: Retry bridge enable when it failed Enric Balletbo i Serra 2018-04-23 10:49 ` [RESEND PATCH v6 05/27] drm/bridge: analogix_dp: Wait for HPD signal before configuring link Enric Balletbo i Serra 2018-04-23 10:49 ` [RESEND PATCH v6 06/27] drm/bridge: analogix_dp: Set PD_INC_BG first when powering up edp phy Enric Balletbo i Serra 2018-04-23 10:49 ` [RESEND PATCH v6 07/27] drm/bridge: analogix_dp: Ensure edp is disabled when shutting down the panel Enric Balletbo i Serra 2018-04-23 10:49 ` [RESEND PATCH v6 08/27] drm/bridge: analogix_dp: Extend hpd check time to 100ms Enric Balletbo i Serra 2018-04-23 10:49 ` [RESEND PATCH v6 09/27] drm/bridge: analogix_dp: Fix incorrect usage of enhanced mode Enric Balletbo i Serra 2018-04-23 10:49 ` [RESEND PATCH v6 10/27] drm/bridge: analogix_dp: Check dpcd write/read status Enric Balletbo i Serra 2018-04-24 13:54 ` Jingoo Han 2018-04-23 10:49 ` [RESEND PATCH v6 11/27] drm/bridge: analogix_dp: Fix AUX_PD bit for Rockchip Enric Balletbo i Serra 2018-04-24 13:57 ` Jingoo Han 2018-04-23 10:49 ` [RESEND PATCH v6 12/27] drm/bridge: analogix_dp: Reset aux channel if an error occurred Enric Balletbo i Serra 2018-04-23 10:49 ` [RESEND PATCH v6 13/27] drm/rockchip: Restore psr->state when enable/disable psr failed Enric Balletbo i Serra 2018-04-24 13:58 ` Jingoo Han 2018-04-23 10:49 ` [RESEND PATCH v6 14/27] drm/bridge: analogix_dp: Don't use ANALOGIX_DP_PLL_CTL to control pll Enric Balletbo i Serra 2018-04-24 1:25 ` Jingoo Han 2018-04-23 10:49 ` [RESEND PATCH v6 15/27] drm/bridge: analogix_dp: Fix timeout of video streamclk config Enric Balletbo i Serra 2018-04-23 10:49 ` [RESEND PATCH v6 16/27] drm/bridge: analogix_dp: Fix incorrect operations with register ANALOGIX_DP_FUNC_EN_1 Enric Balletbo i Serra 2018-04-24 1:29 ` Jingoo Han 2018-04-23 10:49 ` [RESEND PATCH v6 17/27] drm/bridge: analogix_dp: Move fast link training detect to set_bridge Enric Balletbo i Serra 2018-04-23 10:49 ` [RESEND PATCH v6 18/27] drm/bridge: analogix_dp: Reorder plat_data->power_off to happen sooner Enric Balletbo i Serra 2018-04-23 10:49 ` [RESEND PATCH v6 19/27] drm/bridge: analogix_dp: Properly log AUX CH errors Enric Balletbo i Serra 2018-04-23 10:49 ` [RESEND PATCH v6 20/27] drm/bridge: analogix_dp: Properly disable aux chan retries on rockchip Enric Balletbo i Serra 2018-04-23 10:49 ` [RESEND PATCH v6 21/27] drm/rockchip: pre dither down when output bpc is 8bit Enric Balletbo i Serra 2018-04-23 10:49 ` [RESEND PATCH v6 22/27] drm/bridge: analogix_dp: Split the platform-specific poweron in two parts Enric Balletbo i Serra 2018-04-24 14:02 ` Jingoo Han 2018-04-23 10:49 ` Enric Balletbo i Serra [this message] 2018-04-23 10:50 ` [RESEND PATCH v6 24/27] drm/rockchip: psr: Avoid redundant calls to .set() callback Enric Balletbo i Serra 2018-04-23 10:50 ` [RESEND PATCH v6 25/27] drm/rockchip: psr: Sanitize semantics of allow/inhibit API Enric Balletbo i Serra 2018-04-23 10:50 ` [RESEND PATCH v6 26/27] drm/rockchip: Disallow PSR for the whole atomic commit Enric Balletbo i Serra 2018-04-23 10:50 ` [RESEND PATCH v6 27/27] drm/rockchip: psr: Remove flush by CRTC Enric Balletbo i Serra 2018-04-24 6:43 ` [RESEND PATCH v6 00/27] DRM Rockchip rk3399 (Kevin) Andrzej Hajda
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180423105003.9004-24-enric.balletbo@collabora.com \ --to=enric.balletbo@collabora.com \ --cc=Laurent.pinchart@ideasonboard.com \ --cc=a.hajda@samsung.com \ --cc=airlied@linux.ie \ --cc=architt@codeaurora.org \ --cc=dianders@chromium.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=heiko@sntech.de \ --cc=hjc@rock-chips.com \ --cc=hl@rock-chips.com \ --cc=hshi@chromium.org \ --cc=inki.dae@samsung.com \ --cc=jeffy.chen@rock-chips.com \ --cc=jingoohan1@gmail.com \ --cc=jy0922.shim@samsung.com \ --cc=kernel@collabora.com \ --cc=kgene@kernel.org \ --cc=krzk@kernel.org \ --cc=kuankuan.y@gmail.com \ --cc=kyungmin.park@samsung.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=m.szyprowski@samsung.com \ --cc=orjan.eide@arm.com \ --cc=rydberg@bitmath.org \ --cc=seanpaul@chromium.org \ --cc=sw0312.kim@samsung.com \ --cc=tfiga@chromium.org \ --cc=thierry.reding@gmail.com \ --cc=wxt@rock-chips.com \ --cc=wzz@rock-chips.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).