From: Yakir Yang <ykk@rock-chips.com>
To: Inki Dae <inki.dae@samsung.com>,
Andrzej Hajda <a.hajda@samsung.com>,
Joonyoung Shim <jy0922.shim@samsung.com>,
Seung-Woo Kim <sw0312.kim@samsung.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
Jingoo Han <jingoohan1@gmail.com>,
Thierry Reding <treding@nvidia.com>,
Krzysztof Kozlowski <k.kozlowski@samsung.com>,
Rob Herring <robh+dt@kernel.org>,
joe@perches.com, Heiko Stuebner <heiko@sntech.de>,
Mark Yao <mark.yao@rock-chips.com>
Cc: Russell King <linux@arm.linux.org.uk>,
djkurtz@chromium.org, dianders@chromium.org,
Sean Paul <seanpaul@chromium.org>, Kukjin Kim <kgene@kernel.org>,
Kumar Gala <galak@codeaurora.org>,
emil.l.velikov@gmail.com,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Gustavo Padovan <gustavo.padovan@collabora.co.uk>,
Kishon Vijay Abraham I <kishon@ti.com>,
Pawel Moll <pawel.moll@arm.com>,
ajaynumb@gmail.com, robherring2@gmail.com,
javier@osg.samsung.com, Andy Yan <andy.yan@rock-chips.com>,
Yakir Yang <ykk@rock-chips.com>,
dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
linux-rockchip@lists.infradead.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v6 04/17] drm: bridge: analogix/dp: remove duplicate configuration of link rate and link count
Date: Sat, 10 Oct 2015 23:43:46 +0800 [thread overview]
Message-ID: <1444491826-26743-1-git-send-email-ykk@rock-chips.com> (raw)
In-Reply-To: <1444491357-26095-1-git-send-email-ykk@rock-chips.com>
link_rate and lane_count already configured in analogix_dp_set_link_train(),
so we don't need to config those repeatly after training finished, just
remove them out.
Beside Display Port 1.2 already support 5.4Gbps link rate, the maximum sets
would change from {1.62Gbps, 2.7Gbps} to {1.62Gbps, 2.7Gbps, 5.4Gbps}.
Signed-off-by: Yakir Yang <ykk@rock-chips.com>
---
Changes in v6: None
Changes in v5: None
Changes in v4:
- Update commit message more readable. (Jingoo)
- Adjust the order from 05 to 04
Changes in v3:
- The link_rate and lane_count shouldn't config to the DT property value
directly, but we can take those as hardware limite. For example, RK3288
only support 4 physical lanes of 2.7/1.62 Gbps/lane, so DT property would
like "link-rate = 0x0a" "lane-count = 4". (Thierry)
Changes in v2: None
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 8 ++++----
drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 5 +++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index 334181c..96afb67 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -624,6 +624,8 @@ static void analogix_dp_get_max_rx_bandwidth(struct analogix_dp_device *dp,
/*
* For DP rev.1.1, Maximum link rate of Main Link lanes
* 0x06 = 1.62 Gbps, 0x0a = 2.7 Gbps
+ * For DP rev.1.2, Maximum link rate of Main Link lanes
+ * 0x06 = 1.62 Gbps, 0x0a = 2.7 Gbps, 0x14 = 5.4Gbps
*/
analogix_dp_read_byte_from_dpcd(dp, DP_MAX_LINK_RATE, &data);
*bandwidth = data;
@@ -657,7 +659,8 @@ static void analogix_dp_init_training(struct analogix_dp_device *dp,
analogix_dp_get_max_rx_lane_count(dp, &dp->link_train.lane_count);
if ((dp->link_train.link_rate != LINK_RATE_1_62GBPS) &&
- (dp->link_train.link_rate != LINK_RATE_2_70GBPS)) {
+ (dp->link_train.link_rate != LINK_RATE_2_70GBPS) &&
+ (dp->link_train.link_rate != LINK_RATE_5_40GBPS)) {
dev_err(dp->dev, "Rx Max Link Rate is abnormal :%x !\n",
dp->link_train.link_rate);
dp->link_train.link_rate = LINK_RATE_1_62GBPS;
@@ -898,9 +901,6 @@ static void analogix_dp_commit(struct analogix_dp_device *dp)
analogix_dp_enable_rx_to_enhanced_mode(dp, 1);
analogix_dp_enable_enhanced_mode(dp, 1);
- analogix_dp_set_lane_count(dp, dp->video_info->lane_count);
- analogix_dp_set_link_bandwidth(dp, dp->video_info->link_rate);
-
analogix_dp_init_video(dp);
ret = analogix_dp_config_video(dp);
if (ret)
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
index 14d20be..9a90a18 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
@@ -21,8 +21,9 @@
#define MAX_EQ_LOOP 5
enum link_rate_type {
- LINK_RATE_1_62GBPS = 0x06,
- LINK_RATE_2_70GBPS = 0x0a
+ LINK_RATE_1_62GBPS = DP_LINK_BW_1_62,
+ LINK_RATE_2_70GBPS = DP_LINK_BW_2_7,
+ LINK_RATE_5_40GBPS = DP_LINK_BW_5_4,
};
enum link_lane_count_type {
--
1.9.1
next prev parent reply other threads:[~2015-10-10 16:03 UTC|newest]
Thread overview: 151+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-01 5:46 [PATCH v4 0/16] Add Analogix Core Display Port Driver Yakir Yang
2015-09-01 5:46 ` [PATCH v4 01/16] drm: exynos/dp: fix code style Yakir Yang
2015-09-03 0:21 ` Krzysztof Kozlowski
2015-09-03 5:04 ` Yakir Yang
2015-09-03 5:08 ` Krzysztof Kozlowski
2015-09-03 5:33 ` Yakir Yang
2015-09-03 5:57 ` Joe Perches
2015-09-06 1:33 ` Yakir Yang
2015-09-01 5:49 ` [PATCH v4 02/16] drm: exynos/dp: convert to drm bridge mode Yakir Yang
2015-09-01 5:49 ` [PATCH v4 03/16] drm: bridge: analogix/dp: split exynos dp driver to bridge dir Yakir Yang
2015-09-01 20:46 ` Heiko Stuebner
2015-09-02 1:45 ` Yakir Yang
2015-09-04 21:06 ` Rob Herring
2015-09-04 21:29 ` Heiko Stuebner
2015-09-07 8:11 ` Thierry Reding
2015-09-02 14:50 ` Emil Velikov
2015-09-03 3:55 ` Yakir Yang
2015-09-03 0:58 ` Krzysztof Kozlowski
2015-09-03 5:30 ` Yakir Yang
2015-09-04 0:41 ` Krzysztof Kozlowski
2015-09-06 7:49 ` Yakir Yang
2015-09-07 0:22 ` Krzysztof Kozlowski
2015-09-07 2:27 ` Yakir Yang
2015-09-01 5:52 ` [PATCH v4 04/16] drm: bridge: analogix/dp: remove duplicate configuration of link rate and link count Yakir Yang
2015-09-01 5:55 ` [PATCH v4 05/16] drm: bridge: analogix/dp: dynamic parse sync_pol & interlace & colorimetry Yakir Yang
2015-09-03 8:04 ` Krzysztof Kozlowski
2015-09-06 2:00 ` Yakir Yang
2015-09-01 5:58 ` [PATCH v4 06/16] Documentation: drm/bridge: add document for analogix_dp Yakir Yang
2015-09-01 6:01 ` [PATCH v4 07/16] ARM: dts: exynos/dp: remove some properties that deprecated by analogix_dp driver Yakir Yang
2015-09-03 0:01 ` Krzysztof Kozlowski
2015-09-01 6:01 ` [PATCH v4 08/16] drm: rockchip/dp: add rockchip platform dp driver Yakir Yang
2015-09-01 14:24 ` Heiko Stuebner
2015-09-01 14:48 ` Yakir Yang
2015-09-01 21:00 ` Heiko Stuebner
2015-09-02 1:52 ` Yakir Yang
2015-09-01 6:01 ` [PATCH v4 09/16] drm: rockchip: add bpc and color mode setting Yakir Yang
2015-09-01 21:00 ` Heiko Stuebner
2015-09-02 2:06 ` Yakir Yang
2015-09-02 8:34 ` Thierry Reding
2015-09-02 10:02 ` Yakir Yang
2015-09-03 8:38 ` Thierry Reding
2015-09-06 2:06 ` Yakir Yang
2015-09-01 6:04 ` [PATCH v4 10/16] phy: Add driver for rockchip Display Port PHY Yakir Yang
2015-09-01 16:51 ` Heiko Stuebner
2015-09-01 20:58 ` Heiko Stuebner
2015-09-02 1:46 ` Yakir Yang
2015-09-02 1:02 ` Yakir Yang
2015-09-02 13:27 ` Rob Herring
2015-09-03 3:25 ` Yakir Yang
2015-09-03 13:52 ` Heiko Stuebner
2015-09-01 6:07 ` [PATCH v4 11/16] drm: bridge: analogix/dp: add platform device type support Yakir Yang
2015-09-04 0:36 ` Krzysztof Kozlowski
2015-09-06 4:07 ` Yakir Yang
2015-09-06 23:55 ` Krzysztof Kozlowski
2015-09-07 1:47 ` Yakir Yang
2015-09-01 6:09 ` [PATCH v4 12/16] drm: bridge: analogix/dp: add some rk3288 special registers setting Yakir Yang
2015-09-01 6:11 ` [PATCH v4 13/16] drm: bridge: analogix/dp: add max link rate and lane count limit for RK3288 Yakir Yang
2015-09-01 6:14 ` [PATCH v4 14/16] drm: bridge: analogix/dp: try force hpd after plug in lookup failed Yakir Yang
2015-09-02 20:17 ` Rob Herring
2015-09-03 4:27 ` Yakir Yang
2015-09-03 9:04 ` Thierry Reding
2015-09-04 10:20 ` Russell King - ARM Linux
2015-09-07 9:01 ` Thierry Reding
[not found] ` <55EBBA0C.1030100@rock-chips.com>
2015-09-07 8:20 ` Thierry Reding
2015-09-04 21:46 ` Rob Herring
2015-09-06 8:20 ` Yakir Yang
2015-09-07 8:39 ` Thierry Reding
2015-09-03 8:47 ` Thierry Reding
2015-09-03 21:55 ` Rob Herring
2015-09-04 10:01 ` Thierry Reding
2015-09-01 6:17 ` [PATCH v4 15/16] drm: bridge: analogix/dp: move hpd detect to connector detect function Yakir Yang
2015-09-01 6:20 ` [PATCH v4 16/16] drm: bridge: analogix/dp: add edid modes parse in get_modes method Yakir Yang
2015-09-01 21:47 ` [PATCH v4 0/16] Add Analogix Core Display Port Driver Heiko Stuebner
2015-09-02 2:15 ` Yakir Yang
[not found] ` <55FFC3B8.9030108@rock-chips.com>
2015-09-21 9:15 ` Thierry Reding
2015-09-21 10:27 ` Yakir Yang
2015-09-21 11:22 ` Thierry Reding
2015-09-22 7:20 ` [PATCH v5 0/17] " Yakir Yang
2015-09-22 7:26 ` [PATCH v5 01/17] drm: exynos: dp: convert to drm bridge mode Yakir Yang
2015-09-22 7:29 ` [PATCH v5 02/17] drm: bridge: analogix/dp: split exynos dp driver to bridge directory Yakir Yang
2015-09-30 5:17 ` Krzysztof Kozlowski
2015-09-30 6:48 ` Yakir Yang
2015-09-22 7:34 ` [PATCH v5 03/17] drm: bridge: analogix/dp: fix some obvious code style Yakir Yang
2015-09-30 5:22 ` Krzysztof Kozlowski
2015-09-30 6:52 ` Yakir Yang
2015-09-22 7:35 ` [PATCH v5 04/17] drm: bridge: analogix/dp: remove duplicate configuration of link rate and link count Yakir Yang
2015-09-22 7:37 ` [PATCH v5 05/17] drm: bridge: analogix/dp: dynamic parse sync_pol & interlace & dynamic_range Yakir Yang
2015-09-30 5:32 ` Krzysztof Kozlowski
[not found] ` <560B8CF1.7050102@rock-chips.com>
2015-09-30 7:34 ` Krzysztof Kozlowski
[not found] ` <560B9B33.2060409@rock-chips.com>
2015-09-30 8:26 ` Krzysztof Kozlowski
2015-09-30 9:39 ` Yakir Yang
2015-09-22 7:40 ` [PATCH v5 06/17] Documentation: drm/bridge: add document for analogix_dp Yakir Yang
2015-09-22 7:43 ` [PATCH v5 07/17] ARM: dts: exynos/dp: remove some properties that deprecated by analogix_dp driver Yakir Yang
2015-09-30 5:39 ` Krzysztof Kozlowski
2015-09-30 7:20 ` Yakir Yang
2015-09-22 7:45 ` [PATCH v5 08/17] drm: rockchip: dp: add rockchip platform dp driver Yakir Yang
2015-09-22 7:48 ` [PATCH v5 09/17] Documentation: drm/bridge: add document for analogix_dp Yakir Yang
2015-09-22 7:48 ` [PATCH v5 10/17] phy: Add driver for rockchip Display Port PHY Yakir Yang
2015-09-22 7:51 ` [PATCH v5 11/17] Documentation: phy: add document for rockchip dp phy Yakir Yang
2015-09-22 7:55 ` [PATCH v5 12/17] drm: rockchip: vop: add bpc and color mode setting Yakir Yang
2015-09-22 7:57 ` [PATCH v5 13/17] drm: bridge: analogix/dp: add some rk3288 special registers setting Yakir Yang
2015-09-22 8:00 ` [PATCH v5 14/17] drm: bridge: analogix/dp: add max link rate and lane count limit for RK3288 Yakir Yang
2015-09-22 8:02 ` [PATCH v5 15/17] drm: bridge: analogix/dp: try force hpd after plug in lookup failed Yakir Yang
2015-09-22 8:05 ` [PATCH v5 16/17] drm: bridge: analogix/dp: move hpd detect to connector detect function Yakir Yang
2015-09-22 8:07 ` [PATCH v5 17/17] drm: bridge: analogix/dp: add edid modes parse in get_modes method Yakir Yang
2015-10-07 6:25 ` [PATCH v5 0/17] Add Analogix Core Display Port Driver Yakir Yang
2015-10-07 8:46 ` Javier Martinez Canillas
2015-10-07 9:02 ` Yakir Yang
2015-10-07 9:26 ` Javier Martinez Canillas
[not found] ` <5614FC6B.4080702@rock-chips.com>
2015-10-07 11:25 ` Javier Martinez Canillas
2015-10-08 0:40 ` Yakir Yang
2015-10-10 14:31 ` Yakir Yang
2015-10-13 9:21 ` Javier Martinez Canillas
2015-10-13 13:50 ` Yakir Yang
2015-10-14 8:18 ` Javier Martinez Canillas
2015-10-10 15:35 ` [PATCH v6 " Yakir Yang
2015-10-10 15:38 ` [PATCH v6 01/17] drm: exynos: dp: convert to drm bridge mode Yakir Yang
2015-10-10 15:39 ` [PATCH v6 02/17] drm: bridge: analogix/dp: split exynos dp driver to bridge directory Yakir Yang
2015-10-10 15:41 ` [PATCH v6 03/17] drm: bridge: analogix/dp: fix some obvious code style Yakir Yang
2015-10-10 15:43 ` Yakir Yang [this message]
2015-10-10 15:46 ` [PATCH v6 05/17] drm: bridge: analogix/dp: dynamic parse sync_pol & interlace & dynamic_range Yakir Yang
2015-10-12 0:37 ` Yakir Yang
2015-10-12 0:49 ` Krzysztof Kozlowski
2015-10-12 2:43 ` Yakir Yang
2015-10-12 3:51 ` Krzysztof Kozlowski
2015-10-12 4:09 ` Yakir Yang
2015-10-12 4:16 ` Krzysztof Kozlowski
2015-10-10 15:49 ` [PATCH v6 06/17] Documentation: drm/bridge: add document for analogix_dp Yakir Yang
2015-10-10 15:49 ` [PATCH v6 07/17] ARM: dts: exynos/dp: remove some properties that deprecated by analogix_dp driver Yakir Yang
2015-10-10 15:51 ` [PATCH v6 08/17] drm: rockchip: dp: add rockchip platform dp driver Yakir Yang
2015-10-10 15:53 ` [PATCH v6 09/17] Documentation: drm/bridge: add document for analogix_dp Yakir Yang
2015-10-10 15:55 ` [PATCH v6 10/17] phy: Add driver for rockchip Display Port PHY Yakir Yang
2015-10-12 15:02 ` Kishon Vijay Abraham I
2015-10-12 16:18 ` Heiko Stübner
2015-10-13 1:20 ` Yakir Yang
2015-10-10 15:58 ` [PATCH v6 11/17] Documentation: phy: add document for rockchip dp phy Yakir Yang
2015-10-12 22:28 ` Kishon Vijay Abraham I
2015-10-13 1:21 ` Yakir Yang
2015-10-10 16:00 ` [PATCH v6 12/17] drm: rockchip: vop: add bpc and color mode setting Yakir Yang
2015-10-10 16:05 ` [PATCH v6 13/17] drm: bridge: analogix/dp: add some rk3288 special registers setting Yakir Yang
2015-10-10 16:05 ` [PATCH v6 14/17] drm: bridge: analogix/dp: add max link rate and lane count limit for RK3288 Yakir Yang
2015-10-10 16:05 ` [PATCH v6 15/17] drm: bridge: analogix/dp: try force hpd after plug in lookup failed Yakir Yang
2015-10-10 16:05 ` [PATCH v6 16/17] drm: bridge: analogix/dp: move hpd detect to connector detect function Yakir Yang
2015-10-10 16:06 ` [PATCH v6 17/17] drm: bridge: analogix/dp: add edid modes parse in get_modes method Yakir Yang
2015-10-12 4:29 ` [PATCH v7 05/17] drm: bridge: analogix/dp: dynamic parse sync_pol & interlace & dynamic_range Yakir Yang
2015-10-12 6:54 ` Krzysztof Kozlowski
2015-10-12 7:20 ` Yakir Yang
2015-10-19 10:40 ` [PATCH v6 0/17] Add Analogix Core Display Port Driver Javier Martinez Canillas
2015-10-20 2:10 ` Yakir Yang
2015-10-20 9:48 ` Javier Martinez Canillas
2015-10-20 11:40 ` Yakir Yang
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=1444491826-26743-1-git-send-email-ykk@rock-chips.com \
--to=ykk@rock-chips.com \
--cc=a.hajda@samsung.com \
--cc=ajaynumb@gmail.com \
--cc=andy.yan@rock-chips.com \
--cc=devicetree@vger.kernel.org \
--cc=dianders@chromium.org \
--cc=djkurtz@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=emil.l.velikov@gmail.com \
--cc=galak@codeaurora.org \
--cc=gustavo.padovan@collabora.co.uk \
--cc=heiko@sntech.de \
--cc=ijc+devicetree@hellion.org.uk \
--cc=inki.dae@samsung.com \
--cc=javier@osg.samsung.com \
--cc=jingoohan1@gmail.com \
--cc=joe@perches.com \
--cc=jy0922.shim@samsung.com \
--cc=k.kozlowski@samsung.com \
--cc=kgene@kernel.org \
--cc=kishon@ti.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=linux@arm.linux.org.uk \
--cc=mark.yao@rock-chips.com \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=robherring2@gmail.com \
--cc=seanpaul@chromium.org \
--cc=sw0312.kim@samsung.com \
--cc=treding@nvidia.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).