From: Thierry Escande <thierry.escande-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
To: Archit Taneja <architt-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>,
Inki Dae <inki.dae-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>,
Thierry Reding
<thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Sandy Huang <hjc-TNX95d0MmH7DzftRWevZcw@public.gmane.org>,
Sean Paul <seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>,
David Airlie <airlied-cv59FeDIM0c@public.gmane.org>
Cc: "zain wang" <wzz-TNX95d0MmH7DzftRWevZcw@public.gmane.org>,
"Lin Huang" <hl-TNX95d0MmH7DzftRWevZcw@public.gmane.org>,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
"Douglas Anderson"
<dianders-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
"Tomasz Figa" <tfiga-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
"Yakir Yang" <ykk-TNX95d0MmH7DzftRWevZcw@public.gmane.org>,
"Ørjan Eide" <orjan.eide-5wv7dgnIgG8@public.gmane.org>,
"Mark Yao" <mark.yao-TNX95d0MmH7DzftRWevZcw@public.gmane.org>,
"Haixia Shi" <hshi-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
Subject: [PATCH 28/40] drm/bridge: analogix_dp: Fix incorrect operations with register ANALOGIX_DP_FUNC_EN_1
Date: Mon, 15 Jan 2018 18:16:02 +0100 [thread overview]
Message-ID: <20180115171614.14474-29-thierry.escande@collabora.com> (raw)
In-Reply-To: <20180115171614.14474-1-thierry.escande-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>
---
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.14.1
next prev parent reply other threads:[~2018-01-15 17:16 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-15 17:15 [PATCH 00/40] DRM Rockchip rk3399 (Kevin) Thierry Escande
2018-01-15 17:15 ` [PATCH 03/40] drm/rockchip: Respect page offset for PRIME mmap calls Thierry Escande
2018-01-22 10:44 ` Heiko Stuebner
2018-01-15 17:15 ` [PATCH 12/40] drm/rockchip: Only wait for panel ACK on PSR entry Thierry Escande
[not found] ` <20180115171614.14474-1-thierry.escande-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
2018-01-15 17:15 ` [PATCH 01/40] drm/rockchip: Get rid of some unnecessary code Thierry Escande
2018-01-16 3:53 ` Tomasz Figa
2018-01-15 17:15 ` [PATCH 02/40] drm/rockchip: support prime import sg table Thierry Escande
2018-01-22 10:44 ` Heiko Stuebner
2018-01-15 17:15 ` [PATCH 04/40] drm/bridge: analogix_dp: set psr activate/deactivate when enable/disable bridge Thierry Escande
2018-01-15 17:15 ` [PATCH 05/40] drm/bridge: analogix_dp: Don't power bridge in analogix_dp_bind Thierry Escande
2018-01-15 17:15 ` [PATCH 06/40] drm/rockchip: Don't use atomic constructs for psr Thierry Escande
2018-01-15 17:15 ` [PATCH 07/40] drm/bridge: analogix_dp: detect Sink PSR state after configuring the PSR Thierry Escande
2018-01-15 17:15 ` [PATCH 08/40] drm/rockchip: Remove analogix psr worker Thierry Escande
2018-01-15 17:15 ` [PATCH 09/40] drm/bridge: analogix_dp: Don't change psr while bridge is disabled Thierry Escande
2018-01-15 17:15 ` [PATCH 10/40] drm/rockchip: add mutex vop lock Thierry Escande
2018-01-15 17:15 ` [PATCH 11/40] drm/bridge: analogix_dp: add fast link train for eDP Thierry Escande
2018-01-15 17:15 ` [PATCH 13/40] drm/bridge: analogix_dp: Move enable video into config_video() Thierry Escande
2018-01-15 17:15 ` [PATCH 14/40] drm/bridge: analogix_dp: Check AUX_EN status when doing AUX transfer Thierry Escande
2018-01-15 17:15 ` [PATCH 15/40] drm/bridge: analogix_dp: Don't use fast link training when panel just powered up Thierry Escande
2018-01-15 17:15 ` [PATCH 16/40] drm/bridge: analogix_dp: Retry bridge enable when it failed Thierry Escande
2018-01-15 17:15 ` [PATCH 17/40] drm/bridge: analogix_dp: Wait for HPD signal before configuring link Thierry Escande
2018-01-15 17:15 ` [PATCH 18/40] drm/bridge: analogix_dp: Set PD_INC_BG first when powering up edp phy Thierry Escande
2018-01-15 17:15 ` [PATCH 19/40] drm/bridge: analogix_dp: Ensure edp is disabled when shutting down the panel Thierry Escande
2018-01-15 17:15 ` [PATCH 20/40] drm/bridge: analogix_dp: Extend hpd check time to 100ms Thierry Escande
2018-01-15 17:15 ` [PATCH 21/40] drm/bridge: analogix_dp: Fix incorrect usage of enhanced mode Thierry Escande
2018-01-15 17:15 ` [PATCH 22/40] drm/bridge: analogix_dp: Check dpcd write/read status Thierry Escande
2018-01-15 17:15 ` [PATCH 24/40] drm/bridge: analogix_dp: Reset aux channel if an error occurred Thierry Escande
2018-01-15 17:15 ` [PATCH 25/40] drm/rockchip: Restore psr->state when enable/disable psr failed Thierry Escande
2018-01-15 17:16 ` [PATCH 26/40] drm/bridge: analogix_dp: Don't use ANALOGIX_DP_PLL_CTL to control pll Thierry Escande
2018-01-15 17:16 ` [PATCH 27/40] drm/bridge: analogix_dp: Fix timeout of video streamclk config Thierry Escande
2018-01-15 17:16 ` Thierry Escande [this message]
2018-01-15 17:16 ` [PATCH 33/40] drm/rockchip: analogix_dp: Wire the shutdown callback to disable PSR Thierry Escande
2018-01-15 17:16 ` [PATCH 34/40] drm/bridge: analogix_dp: Reorder plat_data->power_off to happen sooner Thierry Escande
2018-01-15 17:16 ` [PATCH 35/40] drm/bridge: analogix_dp: Properly log AUX CH errors Thierry Escande
2018-01-15 17:16 ` [PATCH 36/40] drm/bridge: analogix_dp: Properly disable aux chan retries on rockchip Thierry Escande
2018-01-15 17:16 ` [PATCH 37/40] drm/panel: simple: Change mode for Sharp lq123p1jx31 Thierry Escande
2018-01-15 17:15 ` [PATCH 23/40] drm/bridge: analogix_dp: Fix AUX_PD bit for Rockchip Thierry Escande
2018-01-15 17:16 ` [PATCH 29/40] drm/bridge: analogix_dp: Move fast link training detect to set_bridge Thierry Escande
2018-01-15 17:16 ` [PATCH 30/40] drm/rockchip: Flush PSR before committing modeset disables/enables Thierry Escande
2018-01-16 4:02 ` Tomasz Figa
2018-01-15 17:16 ` [PATCH 31/40] drm/bridge: analogix_dp: Allow master driver to cleanup in unbind Thierry Escande
2018-01-15 17:16 ` [PATCH 32/40] drm/bridge: analogix_dp: Add analogix_dp_shutdown Thierry Escande
2018-01-15 17:16 ` [PATCH 38/40] drm/rockchip: pre dither down when output bpc is 8bit Thierry Escande
2018-01-15 17:16 ` [PATCH 39/40] drm/rockchip: analogix_dp: Fix invalid implementation of unbind Thierry Escande
2018-01-16 2:10 ` Tomasz Figa
2018-01-15 17:16 ` [PATCH 40/40] drm/bridge: analogix_dp: Split the platform-specific poweron in two parts Thierry Escande
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=20180115171614.14474-29-thierry.escande@collabora.com \
--to=thierry.escande-zgy8ohtn/8qb+jhodadfcq@public.gmane.org \
--cc=airlied-cv59FeDIM0c@public.gmane.org \
--cc=architt-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org \
--cc=dianders-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org \
--cc=dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
--cc=hjc-TNX95d0MmH7DzftRWevZcw@public.gmane.org \
--cc=hl-TNX95d0MmH7DzftRWevZcw@public.gmane.org \
--cc=hshi-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org \
--cc=inki.dae-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=mark.yao-TNX95d0MmH7DzftRWevZcw@public.gmane.org \
--cc=orjan.eide-5wv7dgnIgG8@public.gmane.org \
--cc=seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org \
--cc=tfiga-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org \
--cc=thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=wzz-TNX95d0MmH7DzftRWevZcw@public.gmane.org \
--cc=ykk-TNX95d0MmH7DzftRWevZcw@public.gmane.org \
/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).