From: Archit Taneja <architt@codeaurora.org>
To: Enric Balletbo i Serra <enric.balletbo@collabora.com>,
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, ykk@rock-chips.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,
linux-input@vger.kernel.org, orjan.eide@arm.com,
wxt@rock-chips.com, jeffy.chen@rock-chips.com,
linux-arm-kernel@lists.infradead.org, mark.yao@rock-chips.com,
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,
Tomeu Vizoso <tomeu.vizoso@collabora.com>
Subject: Re: [PATCH v5 03/36] drm/bridge: analogix_dp: Don't change psr while bridge is disabled
Date: Wed, 14 Mar 2018 11:00:30 +0530 [thread overview]
Message-ID: <8e68b2ae-21f8-ed3f-1804-f3d1978f8ce2@codeaurora.org> (raw)
In-Reply-To: <20180309222327.18689-4-enric.balletbo@collabora.com>
On Saturday 10 March 2018 03:52 AM, Enric Balletbo i Serra wrote:
> From: zain wang <wzz@rock-chips.com>
>
> There is a race between AUX CH bring-up and enabling bridge which will
> cause link training to fail. To avoid hitting it, don't change psr state
> while enabling the bridge.
Reviewed-by: Archit Taneja <architt@codeaurora.org>
>
> Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>
> Cc: Sean Paul <seanpaul@chromium.org>
> Signed-off-by: zain wang <wzz@rock-chips.com>
> Signed-off-by: Caesar Wang <wxt@rock-chips.com>
> [seanpaul fixed up the commit message a bit and renamed *_supported to *_enabled]
> Signed-off-by: Sean Paul <seanpaul@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>
> ---
>
> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 15 ++++++++-------
> drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 2 +-
> drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 2 +-
> include/drm/bridge/analogix_dp.h | 2 +-
> 4 files changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> index e738aa6de1af..ee00d3d920e0 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> @@ -98,18 +98,18 @@ static int analogix_dp_detect_hpd(struct analogix_dp_device *dp)
> return 0;
> }
>
> -int analogix_dp_psr_supported(struct analogix_dp_device *dp)
> +int analogix_dp_psr_enabled(struct analogix_dp_device *dp)
> {
>
> - return dp->psr_support;
> + return dp->psr_enable;
> }
> -EXPORT_SYMBOL_GPL(analogix_dp_psr_supported);
> +EXPORT_SYMBOL_GPL(analogix_dp_psr_enabled);
>
> int analogix_dp_enable_psr(struct analogix_dp_device *dp)
> {
> struct edp_vsc_psr psr_vsc;
>
> - if (!dp->psr_support)
> + if (!dp->psr_enable)
> return 0;
>
> /* Prepare VSC packet as per EDP 1.4 spec, Table 6.9 */
> @@ -131,7 +131,7 @@ int analogix_dp_disable_psr(struct analogix_dp_device *dp)
> struct edp_vsc_psr psr_vsc;
> int ret;
>
> - if (!dp->psr_support)
> + if (!dp->psr_enable)
> return 0;
>
> /* Prepare VSC packet as per EDP 1.4 spec, Table 6.9 */
> @@ -871,8 +871,8 @@ static void analogix_dp_commit(struct analogix_dp_device *dp)
> /* Enable video */
> analogix_dp_start_video(dp);
>
> - dp->psr_support = analogix_dp_detect_sink_psr(dp);
> - if (dp->psr_support)
> + dp->psr_enable = analogix_dp_detect_sink_psr(dp);
> + if (dp->psr_enable)
> analogix_dp_enable_sink_psr(dp);
> }
>
> @@ -1117,6 +1117,7 @@ static void analogix_dp_bridge_disable(struct drm_bridge *bridge)
> if (ret)
> DRM_ERROR("failed to setup the panel ret = %d\n", ret);
>
> + dp->psr_enable = false;
> dp->dpms_mode = DRM_MODE_DPMS_OFF;
> }
>
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
> index b039b28d8fcc..e135a42cb19e 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
> @@ -170,7 +170,7 @@ struct analogix_dp_device {
> int dpms_mode;
> int hpd_gpio;
> bool force_hpd;
> - bool psr_support;
> + bool psr_enable;
>
> struct mutex panel_lock;
> bool panel_is_modeset;
> diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
> index 36334839a3f8..3e8bf79bea58 100644
> --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
> +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
> @@ -82,7 +82,7 @@ static void analogix_dp_psr_set(struct drm_encoder *encoder, bool enabled)
> struct rockchip_dp_device *dp = to_dp(encoder);
> int ret;
>
> - if (!analogix_dp_psr_supported(dp->adp))
> + if (!analogix_dp_psr_enabled(dp->adp))
> return;
>
> DRM_DEV_DEBUG(dp->dev, "%s PSR...\n", enabled ? "Entry" : "Exit");
> diff --git a/include/drm/bridge/analogix_dp.h b/include/drm/bridge/analogix_dp.h
> index 711fff9b6803..e9a1116d2f8e 100644
> --- a/include/drm/bridge/analogix_dp.h
> +++ b/include/drm/bridge/analogix_dp.h
> @@ -41,7 +41,7 @@ struct analogix_dp_plat_data {
> struct drm_connector *);
> };
>
> -int analogix_dp_psr_supported(struct analogix_dp_device *dp);
> +int analogix_dp_psr_enabled(struct analogix_dp_device *dp);
> int analogix_dp_enable_psr(struct analogix_dp_device *dp);
> int analogix_dp_disable_psr(struct analogix_dp_device *dp);
>
>
next prev parent reply other threads:[~2018-03-14 5:30 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-09 22:22 [PATCH v5 00/36] DRM Rockchip rk3399 (Kevin) Enric Balletbo i Serra
2018-03-09 22:22 ` [PATCH v5 01/36] drm/bridge: analogix_dp: detect Sink PSR state after configuring the PSR Enric Balletbo i Serra
2018-03-12 17:00 ` Heiko Stübner
2018-03-14 5:29 ` Archit Taneja
2018-03-14 10:32 ` Heiko Stübner
2018-03-09 22:22 ` [PATCH v5 02/36] drm/rockchip: Remove analogix psr worker Enric Balletbo i Serra
2018-03-12 16:26 ` Heiko Stübner
2018-03-14 10:32 ` Heiko Stübner
2018-03-09 22:22 ` [PATCH v5 03/36] drm/bridge: analogix_dp: Don't change psr while bridge is disabled Enric Balletbo i Serra
2018-03-12 17:02 ` Heiko Stübner
2018-03-14 5:30 ` Archit Taneja [this message]
2018-03-14 10:32 ` Heiko Stübner
2018-03-09 22:22 ` [PATCH v5 04/36] drm/rockchip: add mutex vop lock Enric Balletbo i Serra
2018-03-12 16:29 ` Heiko Stübner
2018-03-14 10:33 ` Heiko Stübner
2018-03-09 22:22 ` [PATCH v5 05/36] drm/bridge: analogix_dp: add fast link train for eDP Enric Balletbo i Serra
2018-03-14 5:52 ` Archit Taneja
2018-03-14 10:39 ` Heiko Stübner
2018-03-09 22:22 ` [PATCH v5 06/36] drm/rockchip: Only wait for panel ACK on PSR entry Enric Balletbo i Serra
2018-03-12 16:58 ` Heiko Stübner
2018-03-13 0:26 ` Enric Balletbo i Serra
2018-03-14 5:54 ` Archit Taneja
2018-03-14 12:51 ` Heiko Stübner
2018-03-09 22:22 ` [PATCH v5 07/36] drm/bridge: analogix_dp: Move enable video into config_video() Enric Balletbo i Serra
2018-03-14 5:59 ` Archit Taneja
2018-03-17 16:00 ` Heiko Stuebner
2018-03-09 22:22 ` [PATCH v5 08/36] drm/bridge: analogix_dp: Check AUX_EN status when doing AUX transfer Enric Balletbo i Serra
2018-03-14 6:01 ` Archit Taneja
2018-03-09 22:23 ` [PATCH v5 09/36] drm/bridge: analogix_dp: Don't use fast link training when panel just powered up Enric Balletbo i Serra
2018-03-14 6:03 ` Archit Taneja
2018-03-09 22:23 ` [PATCH v5 10/36] drm/bridge: analogix_dp: Retry bridge enable when it failed Enric Balletbo i Serra
2018-03-14 6:07 ` Archit Taneja
2018-03-09 22:23 ` [PATCH v5 11/36] drm/bridge: analogix_dp: Wait for HPD signal before configuring link Enric Balletbo i Serra
2018-03-14 6:09 ` Archit Taneja
2018-03-09 22:23 ` [PATCH v5 12/36] drm/bridge: analogix_dp: Set PD_INC_BG first when powering up edp phy Enric Balletbo i Serra
2018-03-14 6:10 ` Archit Taneja
2018-03-09 22:23 ` [PATCH v5 13/36] drm/bridge: analogix_dp: Ensure edp is disabled when shutting down the panel Enric Balletbo i Serra
2018-03-14 6:14 ` Archit Taneja
2018-03-09 22:23 ` [PATCH v5 14/36] drm/bridge: analogix_dp: Extend hpd check time to 100ms Enric Balletbo i Serra
2018-03-14 6:15 ` Archit Taneja
2018-03-09 22:23 ` [PATCH v5 15/36] drm/bridge: analogix_dp: Fix incorrect usage of enhanced mode Enric Balletbo i Serra
2018-03-14 6:17 ` Archit Taneja
2018-03-09 22:23 ` [PATCH v5 16/36] drm/bridge: analogix_dp: Check dpcd write/read status Enric Balletbo i Serra
2018-03-14 6:19 ` Archit Taneja
2018-03-09 22:23 ` [PATCH v5 17/36] drm/bridge: analogix_dp: Fix AUX_PD bit for Rockchip Enric Balletbo i Serra
2018-03-14 6:23 ` Archit Taneja
2018-03-09 22:23 ` [PATCH v5 18/36] drm/bridge: analogix_dp: Reset aux channel if an error occurred Enric Balletbo i Serra
2018-03-14 6:30 ` Archit Taneja
2018-03-09 22:23 ` [PATCH v5 19/36] drm/rockchip: Restore psr->state when enable/disable psr failed Enric Balletbo i Serra
2018-03-12 17:06 ` Heiko Stübner
2018-03-14 6:32 ` Archit Taneja
2018-03-09 22:23 ` [PATCH v5 20/36] drm/bridge: analogix_dp: Don't use ANALOGIX_DP_PLL_CTL to control pll Enric Balletbo i Serra
2018-03-14 6:33 ` Archit Taneja
2018-03-09 22:23 ` [PATCH v5 21/36] drm/bridge: analogix_dp: Fix timeout of video streamclk config Enric Balletbo i Serra
2018-03-14 6:33 ` Archit Taneja
2018-03-09 22:23 ` [PATCH v5 22/36] drm/bridge: analogix_dp: Fix incorrect operations with register ANALOGIX_DP_FUNC_EN_1 Enric Balletbo i Serra
2018-03-14 6:34 ` Archit Taneja
2018-03-09 22:23 ` [PATCH v5 23/36] drm/bridge: analogix_dp: Move fast link training detect to set_bridge Enric Balletbo i Serra
2018-03-14 6:52 ` Archit Taneja
2018-03-09 22:23 ` [PATCH v5 24/36] drm/bridge: analogix_dp: Reorder plat_data->power_off to happen sooner Enric Balletbo i Serra
2018-03-14 6:50 ` Archit Taneja
2018-03-09 22:23 ` [PATCH v5 25/36] drm/bridge: analogix_dp: Properly log AUX CH errors Enric Balletbo i Serra
2018-03-14 6:52 ` Archit Taneja
2018-03-09 22:23 ` [PATCH v5 26/36] drm/bridge: analogix_dp: Properly disable aux chan retries on rockchip Enric Balletbo i Serra
2018-03-14 6:53 ` Archit Taneja
2018-03-09 22:23 ` [PATCH v5 27/36] drm/rockchip: pre dither down when output bpc is 8bit Enric Balletbo i Serra
2018-03-09 22:23 ` [PATCH v5 28/36] drm/bridge: analogix_dp: Split the platform-specific poweron in two parts Enric Balletbo i Serra
2018-03-09 22:23 ` [PATCH v5 29/36] drm/rockchip: analogix_dp: Do not call Analogix code before bind Enric Balletbo i Serra
2018-03-09 22:23 ` [PATCH v5 30/36] drm/rockchip: Disable PSR on input events Enric Balletbo i Serra
2018-03-09 22:23 ` [PATCH v5 31/36] drm/rockchip: Cancel PSR enable work before changing the state Enric Balletbo i Serra
2018-03-09 22:23 ` [PATCH v5 32/36] drm/rockchip: psr: Avoid redundant calls to .set() callback Enric Balletbo i Serra
2018-03-09 22:23 ` [PATCH v5 33/36] drm/rockchip: psr: Sanitize semantics of allow/disallow API Enric Balletbo i Serra
2018-03-09 22:23 ` [PATCH v5 34/36] drm/rockchip: Disable PSR from reboot notifier Enric Balletbo i Serra
2018-03-09 22:23 ` [PATCH v5 35/36] drm/rockchip: Disallow PSR for the whole atomic commit Enric Balletbo i Serra
2018-03-09 22:23 ` [PATCH v5 36/36] drm/rockchip: psr: Remove flush by CRTC Enric Balletbo i Serra
2018-03-12 17:27 ` [PATCH v5 00/36] DRM Rockchip rk3399 (Kevin) Heiko Stübner
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=8e68b2ae-21f8-ed3f-1804-f3d1978f8ce2@codeaurora.org \
--to=architt@codeaurora.org \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=a.hajda@samsung.com \
--cc=airlied@linux.ie \
--cc=dianders@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=enric.balletbo@collabora.com \
--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-input@vger.kernel.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=mark.yao@rock-chips.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=tomeu.vizoso@collabora.com \
--cc=wxt@rock-chips.com \
--cc=wzz@rock-chips.com \
--cc=ykk@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: link
Be 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).