[PATCH v5 07/17] drm/exynos: exynos_dp: Add legacy bridge to parse the display-timings node

[Damon Ding <damon.ding@rock-chips.com>]

If there is neither a panel nor a bridge, the display timing can be
parsed from the display-timings node under the dp node.

Adding a legacy bridge to parse the display-timings node would get
rid of &analogix_dp_plat_data.get_modes() and make the codes more
consistent.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
---
 drivers/gpu/drm/exynos/exynos_dp.c | 132 ++++++++++++++++++-----------
 1 file changed, 82 insertions(+), 50 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_dp.c b/drivers/gpu/drm/exynos/exynos_dp.c
index 702128d76ae3..33e9758bc00d 100644
--- a/drivers/gpu/drm/exynos/exynos_dp.c
+++ b/drivers/gpu/drm/exynos/exynos_dp.c
@@ -33,16 +33,90 @@
 
 #define to_dp(nm)	container_of(nm, struct exynos_dp_device, nm)
 
+#define to_legacy_bridge(bridge)	container_of(bridge, struct exynos_dp_legacy_bridge, base)
+
 struct exynos_dp_device {
 	struct drm_encoder         encoder;
 	struct drm_device          *drm_dev;
 	struct device              *dev;
 
-	struct videomode           vm;
 	struct analogix_dp_device *adp;
 	struct analogix_dp_plat_data plat_data;
 };
 
+struct exynos_dp_legacy_bridge {
+	struct drm_bridge base;
+	struct drm_display_mode mode;
+
+	u32 bus_flags;
+};
+
+static int exynos_dp_legacy_bridge_attach(struct drm_bridge *bridge,
+					  struct drm_encoder *encoder,
+					  enum drm_bridge_attach_flags flags)
+{
+	if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR))
+		return -EINVAL;
+
+	return 0;
+}
+
+static int exynos_dp_legacy_bridge_get_modes(struct drm_bridge *bridge,
+					     struct drm_connector *connector)
+{
+	struct exynos_dp_legacy_bridge *legacy_bridge = to_legacy_bridge(bridge);
+	int ret;
+
+	ret = drm_connector_helper_get_modes_fixed(connector, &legacy_bridge->mode);
+	if (ret)
+		return ret;
+
+	connector->display_info.bus_flags = legacy_bridge->bus_flags;
+
+	return 0;
+}
+
+struct drm_bridge_funcs exynos_dp_legacy_bridge_funcs = {
+	.attach = exynos_dp_legacy_bridge_attach,
+	.get_modes = exynos_dp_legacy_bridge_get_modes,
+};
+
+static int exynos_dp_dt_parse_legacy_bridge(struct exynos_dp_device *dp,
+					    struct drm_bridge **bridge)
+{
+	struct exynos_dp_legacy_bridge *legacy_bridge;
+	int ret;
+
+	if (!bridge)
+		return -EINVAL;
+
+	legacy_bridge = devm_drm_bridge_alloc(dp->dev, struct exynos_dp_legacy_bridge,
+					      base, &exynos_dp_legacy_bridge_funcs);
+	if (IS_ERR(legacy_bridge))
+		return PTR_ERR(legacy_bridge);
+
+	ret = of_get_drm_display_mode(dp->dev->of_node,
+				      &legacy_bridge->mode,
+				      &legacy_bridge->bus_flags,
+				      OF_USE_NATIVE_MODE);
+	if (ret)
+		return ret;
+
+	legacy_bridge->mode.type |= DRM_MODE_TYPE_DRIVER;
+
+	legacy_bridge->base.of_node = dp->dev->of_node;
+	legacy_bridge->base.ops = DRM_BRIDGE_OP_MODES;
+	legacy_bridge->base.type = DRM_MODE_CONNECTOR_eDP;
+
+	ret = devm_drm_bridge_add(dp->dev, &legacy_bridge->base);
+	if (ret)
+		return ret;
+
+	*bridge = &legacy_bridge->base;
+
+	return 0;
+}
+
 static int exynos_dp_crtc_clock_enable(struct analogix_dp_plat_data *plat_data,
 				bool enable)
 {
@@ -67,44 +141,20 @@ static int exynos_dp_poweroff(struct analogix_dp_plat_data *plat_data)
 	return exynos_dp_crtc_clock_enable(plat_data, false);
 }
 
-static int exynos_dp_get_modes(struct analogix_dp_plat_data *plat_data,
-			       struct drm_connector *connector)
-{
-	struct exynos_dp_device *dp = to_dp(plat_data);
-	struct drm_display_mode *mode;
-
-	if (dp->plat_data.panel)
-		return 0;
-
-	mode = drm_mode_create(connector->dev);
-	if (!mode) {
-		DRM_DEV_ERROR(dp->dev,
-			      "failed to create a new display mode.\n");
-		return 0;
-	}
-
-	drm_display_mode_from_videomode(&dp->vm, mode);
-	connector->display_info.width_mm = mode->width_mm;
-	connector->display_info.height_mm = mode->height_mm;
-
-	mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
-	drm_mode_set_name(mode);
-	drm_mode_probed_add(connector, mode);
-
-	return 1;
-}
-
 static int exynos_dp_bridge_attach(struct analogix_dp_plat_data *plat_data,
 				   struct drm_bridge *bridge,
 				   struct drm_connector *connector)
 {
 	struct exynos_dp_device *dp = to_dp(plat_data);
+	enum drm_bridge_attach_flags flags = 0;
 	int ret;
 
 	/* Pre-empt DP connector creation if there's a bridge */
 	if (plat_data->next_bridge) {
-		ret = drm_bridge_attach(&dp->encoder, plat_data->next_bridge, bridge,
-					0);
+		if (plat_data->next_bridge->funcs == &exynos_dp_legacy_bridge_funcs)
+			flags = DRM_BRIDGE_ATTACH_NO_CONNECTOR;
+
+		ret = drm_bridge_attach(&dp->encoder, plat_data->next_bridge, bridge, flags);
 		if (ret)
 			return ret;
 	}
@@ -129,19 +179,6 @@ static const struct drm_encoder_helper_funcs exynos_dp_encoder_helper_funcs = {
 	.disable = exynos_dp_nop,
 };
 
-static int exynos_dp_dt_parse_panel(struct exynos_dp_device *dp)
-{
-	int ret;
-
-	ret = of_get_videomode(dp->dev->of_node, &dp->vm, OF_USE_NATIVE_MODE);
-	if (ret) {
-		DRM_DEV_ERROR(dp->dev,
-			      "failed: of_get_videomode() : %d\n", ret);
-		return ret;
-	}
-	return 0;
-}
-
 static int exynos_dp_bind(struct device *dev, struct device *master, void *data)
 {
 	struct exynos_dp_device *dp = dev_get_drvdata(dev);
@@ -151,12 +188,6 @@ static int exynos_dp_bind(struct device *dev, struct device *master, void *data)
 
 	dp->drm_dev = drm_dev;
 
-	if (!dp->plat_data.panel && !dp->plat_data.next_bridge) {
-		ret = exynos_dp_dt_parse_panel(dp);
-		if (ret)
-			return ret;
-	}
-
 	drm_simple_encoder_init(drm_dev, encoder, DRM_MODE_ENCODER_TMDS);
 
 	drm_encoder_helper_add(encoder, &exynos_dp_encoder_helper_funcs);
@@ -223,6 +254,8 @@ static int exynos_dp_probe(struct platform_device *pdev)
 	}
 
 	ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0, &panel, &bridge);
+	if (ret == -ENODEV)
+		ret = exynos_dp_dt_parse_legacy_bridge(dp, &bridge);
 	if (ret)
 		return ret;
 
@@ -233,7 +266,6 @@ static int exynos_dp_probe(struct platform_device *pdev)
 	dp->plat_data.power_on = exynos_dp_poweron;
 	dp->plat_data.power_off = exynos_dp_poweroff;
 	dp->plat_data.attach = exynos_dp_bridge_attach;
-	dp->plat_data.get_modes = exynos_dp_get_modes;
 
 out:
 	dp->adp = analogix_dp_probe(dev, &dp->plat_data);
-- 
2.34.1


_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip