FROMLIST: drm: bridge: analogix/dp: add max link rate and lane count limit for RK3288

There are some IP limit on rk3288 that only support 4 physical lanes
of 2.7/1.6 Gbps/lane, so seprate them out by device_type flag.

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

Change-Id: Id1432af874eb0a6dec819d7b7e735c1040f4bf5c
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 26359f4ea4678e1bc497485de46277d1550bd32c..a62e8d07b06ae532cefc321423a549ff361e369f 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -893,8 +893,8 @@ static void analogix_dp_commit(struct analogix_dp_device *dp)
                return;
        }
 
-       ret = analogix_dp_set_link_train(dp, dp->video_info.lane_count,
-                                        dp->video_info.link_rate);
+       ret = analogix_dp_set_link_train(dp, dp->video_info.max_lane_count,
+                                        dp->video_info.max_link_rate);
        if (ret) {
                dev_err(dp->dev, "unable to do link train\n");
                return;
@@ -1203,16 +1203,25 @@ static int analogix_dp_dt_parse_pdata(struct analogix_dp_device *dp)
        struct device_node *dp_node = dp->dev->of_node;
        struct video_info *video_info = &dp->video_info;
 
-       if (of_property_read_u32(dp_node, "samsung,link-rate",
-                                &video_info->link_rate)) {
-               dev_err(dp->dev, "failed to get link-rate\n");
-               return -EINVAL;
-       }
-
-       if (of_property_read_u32(dp_node, "samsung,lane-count",
-                                &video_info->lane_count)) {
-               dev_err(dp->dev, "failed to get lane-count\n");
-               return -EINVAL;
+       switch (dp->plat_data->dev_type) {
+       case RK3288_DP:
+               /*
+                * Like Rk3288 DisplayPort TRM indicate that "Main link
+                * containing 4 physical lanes of 2.7/1.62 Gbps/lane".
+                */
+               video_info->max_link_rate = 0x0A;
+               video_info->max_lane_count = 0x04;
+               break;
+       case EXYNOS_DP:
+               /*
+                * NOTE: those property parseing code is used for
+                * providing backward compatibility for samsung platform.
+                */
+               of_property_read_u32(dp_node, "samsung,link-rate",
+                                    &video_info->max_link_rate);
+               of_property_read_u32(dp_node, "samsung,lane-count",
+                                    &video_info->max_lane_count);
+               break;
        }
 
        return 0;

diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
index 123030f1ba5286abcc3c754844a09c035ac66452..02c0ecffa804574c1c27f1d205f334c486877b84 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
@@ -123,8 +123,8 @@ struct video_info {
        enum color_coefficient ycbcr_coeff;
        enum color_depth color_depth;
 
-       int link_rate;
-       enum link_lane_count_type lane_count;
+       int max_link_rate;
+       enum link_lane_count_type max_lane_count;
 };
 
 struct link_train {