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: hshi@chromium.org, wzz@rock-chips.com, hl@rock-chips.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, dianders@chromium.org, linux-rockchip@lists.infradead.org, orjan.eide@arm.com, m.szyprowski@samsung.com, Enric Balletbo i Serra <enric.balletbo@collabora.com> Subject: [PATCH v4 24/38] drm/bridge: analogix_dp: Fix incorrect operations with register ANALOGIX_DP_FUNC_EN_1 Date: Mon, 5 Mar 2018 23:23:16 +0100 [thread overview] Message-ID: <20180305222324.5872-25-enric.balletbo@collabora.com> (raw) In-Reply-To: <20180305222324.5872-1-enric.balletbo@collabora.com> From: zain wang <wzz@rock-chips.com> Register ANALOGIX_DP_FUNC_EN_1(offset 0x18), Rockchip is different to Exynos: on Exynos edp phy, BIT 7 MASTER_VID_FUNC_EN_N BIT 6 reserved BIT 5 SLAVE_VID_FUNC_EN_N on Rockchip edp phy, BIT 7 reserved BIT 6 RK_VID_CAP_FUNC_EN_N BIT 5 RK_VID_FIFO_FUNC_EN_N So, we should do some private operations to Rockchip. Cc: Tomasz Figa <tfiga@chromium.org> Signed-off-by: zain wang <wzz@rock-chips.com> Signed-off-by: Sean Paul <seanpaul@chromium.org> Signed-off-by: Thierry Escande <thierry.escande@collabora.com> Reviewed-by: Andrzej Hajda <a.hajda@samsung.com> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> --- drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 19 ++++++++++++++----- drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h | 2 ++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c index 02ab1aaa9993..4eae206ec31b 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c @@ -126,9 +126,14 @@ void analogix_dp_reset(struct analogix_dp_device *dp) analogix_dp_stop_video(dp); analogix_dp_enable_video_mute(dp, 0); - reg = MASTER_VID_FUNC_EN_N | SLAVE_VID_FUNC_EN_N | - AUD_FIFO_FUNC_EN_N | AUD_FUNC_EN_N | - HDCP_FUNC_EN_N | SW_FUNC_EN_N; + if (dp->plat_data && is_rockchip(dp->plat_data->dev_type)) + reg = RK_VID_CAP_FUNC_EN_N | RK_VID_FIFO_FUNC_EN_N | + SW_FUNC_EN_N; + else + reg = MASTER_VID_FUNC_EN_N | SLAVE_VID_FUNC_EN_N | + AUD_FIFO_FUNC_EN_N | AUD_FUNC_EN_N | + HDCP_FUNC_EN_N | SW_FUNC_EN_N; + writel(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_1); reg = SSC_FUNC_EN_N | AUX_FUNC_EN_N | @@ -971,8 +976,12 @@ void analogix_dp_config_video_slave_mode(struct analogix_dp_device *dp) u32 reg; reg = readl(dp->reg_base + ANALOGIX_DP_FUNC_EN_1); - reg &= ~(MASTER_VID_FUNC_EN_N | SLAVE_VID_FUNC_EN_N); - reg |= MASTER_VID_FUNC_EN_N; + if (dp->plat_data && is_rockchip(dp->plat_data->dev_type)) { + reg &= ~(RK_VID_CAP_FUNC_EN_N | RK_VID_FIFO_FUNC_EN_N); + } else { + reg &= ~(MASTER_VID_FUNC_EN_N | SLAVE_VID_FUNC_EN_N); + reg |= MASTER_VID_FUNC_EN_N; + } writel(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_1); reg = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10); diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h index b633a4a5082a..0cf27c731727 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h @@ -127,7 +127,9 @@ /* ANALOGIX_DP_FUNC_EN_1 */ #define MASTER_VID_FUNC_EN_N (0x1 << 7) +#define RK_VID_CAP_FUNC_EN_N (0x1 << 6) #define SLAVE_VID_FUNC_EN_N (0x1 << 5) +#define RK_VID_FIFO_FUNC_EN_N (0x1 << 5) #define AUD_FIFO_FUNC_EN_N (0x1 << 4) #define AUD_FUNC_EN_N (0x1 << 3) #define HDCP_FUNC_EN_N (0x1 << 2) -- 2.16.1
WARNING: multiple messages have this Message-ID (diff)
From: Enric Balletbo i Serra <enric.balletbo-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> To: architt-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, inki.dae-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org, thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, hjc-TNX95d0MmH7DzftRWevZcw@public.gmane.org, seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org, airlied-cv59FeDIM0c@public.gmane.org, tfiga-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org, heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org Cc: wzz-TNX95d0MmH7DzftRWevZcw@public.gmane.org, hl-TNX95d0MmH7DzftRWevZcw@public.gmane.org, dianders-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, Enric Balletbo i Serra <enric.balletbo-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>, orjan.eide-5wv7dgnIgG8@public.gmane.org, m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org, hshi-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org Subject: [PATCH v4 24/38] drm/bridge: analogix_dp: Fix incorrect operations with register ANALOGIX_DP_FUNC_EN_1 Date: Mon, 5 Mar 2018 23:23:16 +0100 [thread overview] Message-ID: <20180305222324.5872-25-enric.balletbo@collabora.com> (raw) In-Reply-To: <20180305222324.5872-1-enric.balletbo-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> From: zain wang <wzz-TNX95d0MmH7DzftRWevZcw@public.gmane.org> Register ANALOGIX_DP_FUNC_EN_1(offset 0x18), Rockchip is different to Exynos: on Exynos edp phy, BIT 7 MASTER_VID_FUNC_EN_N BIT 6 reserved BIT 5 SLAVE_VID_FUNC_EN_N on Rockchip edp phy, BIT 7 reserved BIT 6 RK_VID_CAP_FUNC_EN_N BIT 5 RK_VID_FIFO_FUNC_EN_N So, we should do some private operations to Rockchip. Cc: Tomasz Figa <tfiga-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> Signed-off-by: zain wang <wzz-TNX95d0MmH7DzftRWevZcw@public.gmane.org> Signed-off-by: Sean Paul <seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> Signed-off-by: Thierry Escande <thierry.escande-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> Reviewed-by: Andrzej Hajda <a.hajda-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> Signed-off-by: Enric Balletbo i Serra <enric.balletbo-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> --- drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 19 ++++++++++++++----- drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h | 2 ++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c index 02ab1aaa9993..4eae206ec31b 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c @@ -126,9 +126,14 @@ void analogix_dp_reset(struct analogix_dp_device *dp) analogix_dp_stop_video(dp); analogix_dp_enable_video_mute(dp, 0); - reg = MASTER_VID_FUNC_EN_N | SLAVE_VID_FUNC_EN_N | - AUD_FIFO_FUNC_EN_N | AUD_FUNC_EN_N | - HDCP_FUNC_EN_N | SW_FUNC_EN_N; + if (dp->plat_data && is_rockchip(dp->plat_data->dev_type)) + reg = RK_VID_CAP_FUNC_EN_N | RK_VID_FIFO_FUNC_EN_N | + SW_FUNC_EN_N; + else + reg = MASTER_VID_FUNC_EN_N | SLAVE_VID_FUNC_EN_N | + AUD_FIFO_FUNC_EN_N | AUD_FUNC_EN_N | + HDCP_FUNC_EN_N | SW_FUNC_EN_N; + writel(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_1); reg = SSC_FUNC_EN_N | AUX_FUNC_EN_N | @@ -971,8 +976,12 @@ void analogix_dp_config_video_slave_mode(struct analogix_dp_device *dp) u32 reg; reg = readl(dp->reg_base + ANALOGIX_DP_FUNC_EN_1); - reg &= ~(MASTER_VID_FUNC_EN_N | SLAVE_VID_FUNC_EN_N); - reg |= MASTER_VID_FUNC_EN_N; + if (dp->plat_data && is_rockchip(dp->plat_data->dev_type)) { + reg &= ~(RK_VID_CAP_FUNC_EN_N | RK_VID_FIFO_FUNC_EN_N); + } else { + reg &= ~(MASTER_VID_FUNC_EN_N | SLAVE_VID_FUNC_EN_N); + reg |= MASTER_VID_FUNC_EN_N; + } writel(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_1); reg = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10); diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h index b633a4a5082a..0cf27c731727 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h @@ -127,7 +127,9 @@ /* ANALOGIX_DP_FUNC_EN_1 */ #define MASTER_VID_FUNC_EN_N (0x1 << 7) +#define RK_VID_CAP_FUNC_EN_N (0x1 << 6) #define SLAVE_VID_FUNC_EN_N (0x1 << 5) +#define RK_VID_FIFO_FUNC_EN_N (0x1 << 5) #define AUD_FIFO_FUNC_EN_N (0x1 << 4) #define AUD_FUNC_EN_N (0x1 << 3) #define HDCP_FUNC_EN_N (0x1 << 2) -- 2.16.1
next prev parent reply other threads:[~2018-03-05 22:26 UTC|newest] Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <CGME20180305222337epcas3p22a4f5c32c5622d89f6e649b26c0a6043@epcas3p2.samsung.com> 2018-03-05 22:22 ` [PATCH v4 00/38] DRM Rockchip rk3399 (Kevin) Enric Balletbo i Serra 2018-03-05 22:22 ` [PATCH v4 01/38] drm/bridge: analogix_dp: set psr activate/deactivate when enable/disable bridge Enric Balletbo i Serra 2018-03-08 22:44 ` Heiko Stuebner 2018-03-08 22:44 ` Heiko Stuebner 2018-03-05 22:22 ` [PATCH v4 02/38] drm/rockchip: Don't use atomic constructs for psr Enric Balletbo i Serra 2018-03-05 22:22 ` Enric Balletbo i Serra 2018-03-08 22:44 ` Heiko Stuebner 2018-03-08 22:44 ` Heiko Stuebner 2018-03-05 22:22 ` [PATCH v4 03/38] drm/bridge: analogix_dp: detect Sink PSR state after configuring the PSR Enric Balletbo i Serra 2018-03-08 22:53 ` Heiko Stuebner 2018-03-08 22:53 ` Heiko Stuebner 2018-03-05 22:22 ` [PATCH v4 04/38] drm/rockchip: Remove analogix psr worker Enric Balletbo i Serra 2018-03-05 22:22 ` [PATCH v4 05/38] drm/bridge: analogix_dp: Don't change psr while bridge is disabled Enric Balletbo i Serra 2018-03-05 22:22 ` Enric Balletbo i Serra 2018-03-05 22:22 ` [PATCH v4 06/38] drm/rockchip: add mutex vop lock Enric Balletbo i Serra 2018-03-05 22:22 ` [PATCH v4 07/38] drm/bridge: analogix_dp: add fast link train for eDP Enric Balletbo i Serra 2018-03-05 22:22 ` Enric Balletbo i Serra 2018-03-05 22:23 ` [PATCH v4 08/38] drm/rockchip: Only wait for panel ACK on PSR entry Enric Balletbo i Serra 2018-03-05 22:23 ` [PATCH v4 09/38] drm/bridge: analogix_dp: Move enable video into config_video() Enric Balletbo i Serra 2018-03-05 22:23 ` Enric Balletbo i Serra 2018-03-05 22:23 ` [PATCH v4 10/38] drm/bridge: analogix_dp: Check AUX_EN status when doing AUX transfer Enric Balletbo i Serra 2018-03-05 22:23 ` [PATCH v4 11/38] drm/bridge: analogix_dp: Don't use fast link training when panel just powered up Enric Balletbo i Serra 2018-03-05 22:23 ` [PATCH v4 12/38] drm/bridge: analogix_dp: Retry bridge enable when it failed Enric Balletbo i Serra 2018-03-05 22:23 ` Enric Balletbo i Serra 2018-03-05 22:23 ` [PATCH v4 13/38] drm/bridge: analogix_dp: Wait for HPD signal before configuring link Enric Balletbo i Serra 2018-03-05 22:23 ` [PATCH v4 14/38] drm/bridge: analogix_dp: Set PD_INC_BG first when powering up edp phy Enric Balletbo i Serra 2018-03-05 22:23 ` [PATCH v4 15/38] drm/bridge: analogix_dp: Ensure edp is disabled when shutting down the panel Enric Balletbo i Serra 2018-03-05 22:23 ` Enric Balletbo i Serra 2018-03-06 7:35 ` Marek Szyprowski 2018-03-06 8:49 ` Enric Balletbo i Serra 2018-03-05 22:23 ` [PATCH v4 16/38] drm/bridge: analogix_dp: Extend hpd check time to 100ms Enric Balletbo i Serra 2018-03-05 22:23 ` [PATCH v4 17/38] drm/bridge: analogix_dp: Fix incorrect usage of enhanced mode Enric Balletbo i Serra 2018-03-05 22:23 ` Enric Balletbo i Serra 2018-03-05 22:23 ` [PATCH v4 18/38] drm/bridge: analogix_dp: Check dpcd write/read status Enric Balletbo i Serra 2018-03-05 22:23 ` [PATCH v4 19/38] drm/bridge: analogix_dp: Fix AUX_PD bit for Rockchip Enric Balletbo i Serra 2018-03-05 22:23 ` [PATCH v4 20/38] drm/bridge: analogix_dp: Reset aux channel if an error occurred Enric Balletbo i Serra 2018-03-05 22:23 ` Enric Balletbo i Serra 2018-03-05 22:23 ` [PATCH v4 21/38] drm/rockchip: Restore psr->state when enable/disable psr failed Enric Balletbo i Serra 2018-03-05 22:23 ` [PATCH v4 22/38] drm/bridge: analogix_dp: Don't use ANALOGIX_DP_PLL_CTL to control pll Enric Balletbo i Serra 2018-03-05 22:23 ` Enric Balletbo i Serra 2018-03-05 22:23 ` [PATCH v4 23/38] drm/bridge: analogix_dp: Fix timeout of video streamclk config Enric Balletbo i Serra 2018-03-05 22:23 ` Enric Balletbo i Serra [this message] 2018-03-05 22:23 ` [PATCH v4 24/38] drm/bridge: analogix_dp: Fix incorrect operations with register ANALOGIX_DP_FUNC_EN_1 Enric Balletbo i Serra 2018-03-05 22:23 ` [PATCH v4 25/38] drm/bridge: analogix_dp: Move fast link training detect to set_bridge Enric Balletbo i Serra 2018-03-05 22:23 ` [PATCH v4 26/38] drm/bridge: analogix_dp: Reorder plat_data->power_off to happen sooner Enric Balletbo i Serra 2018-03-05 22:23 ` Enric Balletbo i Serra 2018-03-05 22:23 ` [PATCH v4 27/38] drm/bridge: analogix_dp: Properly log AUX CH errors Enric Balletbo i Serra 2018-03-05 22:23 ` [PATCH v4 28/38] drm/bridge: analogix_dp: Properly disable aux chan retries on rockchip Enric Balletbo i Serra 2018-03-05 22:23 ` [PATCH v4 29/38] drm/rockchip: pre dither down when output bpc is 8bit Enric Balletbo i Serra 2018-03-05 22:23 ` [PATCH v4 30/38] drm/bridge: analogix_dp: Split the platform-specific poweron in two parts Enric Balletbo i Serra 2018-03-05 22:23 ` Enric Balletbo i Serra 2018-03-05 22:23 ` [PATCH v4 31/38] drm/rockchip: analogix_dp: Do not call Analogix code before bind Enric Balletbo i Serra 2018-03-05 22:23 ` [PATCH v4 32/38] drm/rockchip: Disable PSR on input events Enric Balletbo i Serra 2018-03-06 10:15 ` [PATCH v4 00/38] DRM Rockchip rk3399 (Kevin) Marek Szyprowski 2018-03-06 10:15 ` Marek Szyprowski
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=20180305222324.5872-25-enric.balletbo@collabora.com \ --to=enric.balletbo@collabora.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=linux-kernel@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=m.szyprowski@samsung.com \ --cc=orjan.eide@arm.com \ --cc=seanpaul@chromium.org \ --cc=tfiga@chromium.org \ --cc=thierry.reding@gmail.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 an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.