Commit 1644127f authored by Sam Ravnborg's avatar Sam Ravnborg

drm/bridge: tc358764: add drm_panel_bridge support

Prepare the tc358764 bridge driver for use in a chained setup by
replacing direct use of drm_panel with drm_panel_bridge support.

The bridge panel will use the connector type reported by the panel,
where the connector for this driver hardcodes DRM_MODE_CONNECTOR_LVDS.

The tc358764 did not add any additional info the the connector so the
connector creation is passed to the bridge panel driver.

v3:
  - Merge with patch to make connector creation optional to avoid
    creating two connectors (Laurent)
  - Pass connector creation to bridge panel, as this bridge driver
    did not add any extra info to the connector.
  - Set bridge.type to DRM_MODE_CONNECTOR_LVDS.

v2:
  - Use PTR_ERR_OR_ZERO() (kbuild test robot)
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: kbuild test robot <lkp@intel.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Jonas Karlman <jonas@kwiboo.se>
Cc: Jernej Skrabec <jernej.skrabec@siol.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20200726203324.3722593-5-sam@ravnborg.org
parent 385ca38d
...@@ -153,10 +153,9 @@ static const char * const tc358764_supplies[] = { ...@@ -153,10 +153,9 @@ static const char * const tc358764_supplies[] = {
struct tc358764 { struct tc358764 {
struct device *dev; struct device *dev;
struct drm_bridge bridge; struct drm_bridge bridge;
struct drm_connector connector;
struct regulator_bulk_data supplies[ARRAY_SIZE(tc358764_supplies)]; struct regulator_bulk_data supplies[ARRAY_SIZE(tc358764_supplies)];
struct gpio_desc *gpio_reset; struct gpio_desc *gpio_reset;
struct drm_panel *panel; struct drm_bridge *panel_bridge;
int error; int error;
}; };
...@@ -210,12 +209,6 @@ static inline struct tc358764 *bridge_to_tc358764(struct drm_bridge *bridge) ...@@ -210,12 +209,6 @@ static inline struct tc358764 *bridge_to_tc358764(struct drm_bridge *bridge)
return container_of(bridge, struct tc358764, bridge); return container_of(bridge, struct tc358764, bridge);
} }
static inline
struct tc358764 *connector_to_tc358764(struct drm_connector *connector)
{
return container_of(connector, struct tc358764, connector);
}
static int tc358764_init(struct tc358764 *ctx) static int tc358764_init(struct tc358764 *ctx)
{ {
u32 v = 0; u32 v = 0;
...@@ -278,43 +271,11 @@ static void tc358764_reset(struct tc358764 *ctx) ...@@ -278,43 +271,11 @@ static void tc358764_reset(struct tc358764 *ctx)
usleep_range(1000, 2000); usleep_range(1000, 2000);
} }
static int tc358764_get_modes(struct drm_connector *connector)
{
struct tc358764 *ctx = connector_to_tc358764(connector);
return drm_panel_get_modes(ctx->panel, connector);
}
static const
struct drm_connector_helper_funcs tc358764_connector_helper_funcs = {
.get_modes = tc358764_get_modes,
};
static const struct drm_connector_funcs tc358764_connector_funcs = {
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = drm_connector_cleanup,
.reset = drm_atomic_helper_connector_reset,
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
};
static void tc358764_disable(struct drm_bridge *bridge)
{
struct tc358764 *ctx = bridge_to_tc358764(bridge);
int ret = drm_panel_disable(bridge_to_tc358764(bridge)->panel);
if (ret < 0)
dev_err(ctx->dev, "error disabling panel (%d)\n", ret);
}
static void tc358764_post_disable(struct drm_bridge *bridge) static void tc358764_post_disable(struct drm_bridge *bridge)
{ {
struct tc358764 *ctx = bridge_to_tc358764(bridge); struct tc358764 *ctx = bridge_to_tc358764(bridge);
int ret; int ret;
ret = drm_panel_unprepare(ctx->panel);
if (ret < 0)
dev_err(ctx->dev, "error unpreparing panel (%d)\n", ret);
tc358764_reset(ctx); tc358764_reset(ctx);
usleep_range(10000, 15000); usleep_range(10000, 15000);
ret = regulator_bulk_disable(ARRAY_SIZE(ctx->supplies), ctx->supplies); ret = regulator_bulk_disable(ARRAY_SIZE(ctx->supplies), ctx->supplies);
...@@ -335,70 +296,28 @@ static void tc358764_pre_enable(struct drm_bridge *bridge) ...@@ -335,70 +296,28 @@ static void tc358764_pre_enable(struct drm_bridge *bridge)
ret = tc358764_init(ctx); ret = tc358764_init(ctx);
if (ret < 0) if (ret < 0)
dev_err(ctx->dev, "error initializing bridge (%d)\n", ret); dev_err(ctx->dev, "error initializing bridge (%d)\n", ret);
ret = drm_panel_prepare(ctx->panel);
if (ret < 0)
dev_err(ctx->dev, "error preparing panel (%d)\n", ret);
}
static void tc358764_enable(struct drm_bridge *bridge)
{
struct tc358764 *ctx = bridge_to_tc358764(bridge);
int ret = drm_panel_enable(ctx->panel);
if (ret < 0)
dev_err(ctx->dev, "error enabling panel (%d)\n", ret);
} }
static int tc358764_attach(struct drm_bridge *bridge, static int tc358764_attach(struct drm_bridge *bridge,
enum drm_bridge_attach_flags flags) enum drm_bridge_attach_flags flags)
{
struct tc358764 *ctx = bridge_to_tc358764(bridge);
struct drm_device *drm = bridge->dev;
int ret;
if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) {
DRM_ERROR("Fix bridge driver to make connector optional!");
return -EINVAL;
}
ctx->connector.polled = DRM_CONNECTOR_POLL_HPD;
ret = drm_connector_init(drm, &ctx->connector,
&tc358764_connector_funcs,
DRM_MODE_CONNECTOR_LVDS);
if (ret) {
DRM_ERROR("Failed to initialize connector\n");
return ret;
}
drm_connector_helper_add(&ctx->connector,
&tc358764_connector_helper_funcs);
drm_connector_attach_encoder(&ctx->connector, bridge->encoder);
drm_panel_attach(ctx->panel, &ctx->connector);
ctx->connector.funcs->reset(&ctx->connector);
return 0;
}
static void tc358764_detach(struct drm_bridge *bridge)
{ {
struct tc358764 *ctx = bridge_to_tc358764(bridge); struct tc358764 *ctx = bridge_to_tc358764(bridge);
drm_panel_detach(ctx->panel); return drm_bridge_attach(bridge->encoder, ctx->panel_bridge,
ctx->panel = NULL; bridge, flags);
} }
static const struct drm_bridge_funcs tc358764_bridge_funcs = { static const struct drm_bridge_funcs tc358764_bridge_funcs = {
.disable = tc358764_disable,
.post_disable = tc358764_post_disable, .post_disable = tc358764_post_disable,
.enable = tc358764_enable,
.pre_enable = tc358764_pre_enable, .pre_enable = tc358764_pre_enable,
.attach = tc358764_attach, .attach = tc358764_attach,
.detach = tc358764_detach,
}; };
static int tc358764_parse_dt(struct tc358764 *ctx) static int tc358764_parse_dt(struct tc358764 *ctx)
{ {
struct drm_bridge *panel_bridge;
struct device *dev = ctx->dev; struct device *dev = ctx->dev;
struct drm_panel *panel;
int ret; int ret;
ctx->gpio_reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW); ctx->gpio_reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW);
...@@ -407,12 +326,16 @@ static int tc358764_parse_dt(struct tc358764 *ctx) ...@@ -407,12 +326,16 @@ static int tc358764_parse_dt(struct tc358764 *ctx)
return PTR_ERR(ctx->gpio_reset); return PTR_ERR(ctx->gpio_reset);
} }
ret = drm_of_find_panel_or_bridge(ctx->dev->of_node, 1, 0, &ctx->panel, ret = drm_of_find_panel_or_bridge(dev->of_node, 1, 0, &panel, NULL);
NULL); if (ret)
if (ret && ret != -EPROBE_DEFER) return ret;
dev_err(dev, "cannot find panel (%d)\n", ret);
return ret; panel_bridge = devm_drm_panel_bridge_add(dev, panel);
if (IS_ERR(panel_bridge))
return PTR_ERR(panel_bridge);
ctx->panel_bridge = panel_bridge;
return 0;
} }
static int tc358764_configure_regulators(struct tc358764 *ctx) static int tc358764_configure_regulators(struct tc358764 *ctx)
...@@ -458,6 +381,7 @@ static int tc358764_probe(struct mipi_dsi_device *dsi) ...@@ -458,6 +381,7 @@ static int tc358764_probe(struct mipi_dsi_device *dsi)
return ret; return ret;
ctx->bridge.funcs = &tc358764_bridge_funcs; ctx->bridge.funcs = &tc358764_bridge_funcs;
ctx->bridge.type = DRM_MODE_CONNECTOR_LVDS;
ctx->bridge.of_node = dev->of_node; ctx->bridge.of_node = dev->of_node;
drm_bridge_add(&ctx->bridge); drm_bridge_add(&ctx->bridge);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment