FROMLIST: drm: bridge: analogix/dp: remove duplicate configuration of link rate and...

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}.

(am from https://patchwork.kernel.org/patch/8312771/)

Change-Id: I8cbf7146d70143bb5d30b3fa971e19f034c30e62
Tested-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Yakir Yang <ykk@rock-chips.com>

diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index 6901a6feeca2fd642d7d2967f5dce9fae5239372..b948636eea32766c07395018e42cd5ba54f33327 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -627,6 +627,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;
@@ -647,7 +649,7 @@ static void analogix_dp_get_max_rx_lane_count(struct analogix_dp_device *dp,
 
 static void analogix_dp_init_training(struct analogix_dp_device *dp,
                                      enum link_lane_count_type max_lane,
-                                     enum link_rate_type max_rate)
+                                     int max_rate)
 {
        /*
         * MACRO_RST must be applied after the PLL_LOCK to avoid
@@ -659,11 +661,12 @@ static void analogix_dp_init_training(struct analogix_dp_device *dp,
        analogix_dp_get_max_rx_bandwidth(dp, &dp->link_train.link_rate);
        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)) {
+       if ((dp->link_train.link_rate != DP_LINK_BW_1_62) &&
+           (dp->link_train.link_rate != DP_LINK_BW_2_7) &&
+           (dp->link_train.link_rate != DP_LINK_BW_5_4)) {
                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;
+               dp->link_train.link_rate = DP_LINK_BW_1_62;
        }
 
        if (dp->link_train.lane_count == 0) {
@@ -901,9 +904,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 d4c4ae23e28ed5d2848f90db89eac3b865887b75..afb0a530177d7c2481c9d4f2b451fe4728c67507 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
@@ -20,11 +20,6 @@
 #define MAX_CR_LOOP 5
 #define MAX_EQ_LOOP 5
 
-enum link_rate_type {
-       LINK_RATE_1_62GBPS = 0x06,
-       LINK_RATE_2_70GBPS = 0x0a
-};
-
 enum link_lane_count_type {
        LANE_COUNT1 = 1,
        LANE_COUNT2 = 2,
@@ -128,7 +123,7 @@ struct video_info {
        enum color_coefficient ycbcr_coeff;
        enum color_depth color_depth;
 
-       enum link_rate_type link_rate;
+       int link_rate;
        enum link_lane_count_type lane_count;
 };
 

diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
index a388c0a40513fb9d64354bdbf6877d1e75d98d5d..eb0b63c9ba5950660854abe6b0a2c85acbf77e2f 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
@@ -855,7 +855,7 @@ void analogix_dp_set_link_bandwidth(struct analogix_dp_device *dp, u32 bwtype)
        u32 reg;
 
        reg = bwtype;
-       if ((bwtype == LINK_RATE_2_70GBPS) || (bwtype == LINK_RATE_1_62GBPS))
+       if ((bwtype == DP_LINK_BW_2_7) || (bwtype == DP_LINK_BW_1_62))
                writel(reg, dp->reg_base + ANALOGIX_DP_LINK_BW_SET);
 }