| Message ID | 20191210225750.15709-14-laurent.pinchart@ideasonboard.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/omap: Replace custom display drivers with drm_bridge and drm_panel | expand |
On Wed, 11 Dec 2019 00:57:13 +0200 Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote: > Implement the newly added bridge connector operations, allowing the > usage of drm_bridge_panel with drm_bridge_connector. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> > --- > Changes since v2: > > - Use the connector type from the panel instead of hardcoding it to DPI > - Rebased on top top of Sam's panel .get_modes() rework > --- > drivers/gpu/drm/bridge/panel.c | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c > index 25c77cb24f42..cf4be369d75e 100644 > --- a/drivers/gpu/drm/bridge/panel.c > +++ b/drivers/gpu/drm/bridge/panel.c > @@ -61,7 +61,7 @@ static int panel_bridge_attach(struct drm_bridge *bridge, > int ret; > > if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) > - return -EINVAL; > + return 0; > > if (!bridge->encoder) { > DRM_ERROR("Missing encoder\n"); > @@ -124,6 +124,14 @@ static void panel_bridge_post_disable(struct drm_bridge *bridge) > drm_panel_unprepare(panel_bridge->panel); > } > > +static int panel_bridge_get_modes(struct drm_bridge *bridge, > + struct drm_connector *connector) > +{ > + struct panel_bridge *panel_bridge = drm_bridge_to_panel_bridge(bridge); > + > + return drm_panel_get_modes(panel_bridge->panel, connector); > +} > + > static const struct drm_bridge_funcs panel_bridge_bridge_funcs = { > .attach = panel_bridge_attach, > .detach = panel_bridge_detach, > @@ -131,6 +139,7 @@ static const struct drm_bridge_funcs panel_bridge_bridge_funcs = { > .enable = panel_bridge_enable, > .disable = panel_bridge_disable, > .post_disable = panel_bridge_post_disable, > + .get_modes = panel_bridge_get_modes, > }; > > /** > @@ -200,6 +209,8 @@ struct drm_bridge *drm_panel_bridge_add_typed(struct drm_panel *panel, > #ifdef CONFIG_OF > panel_bridge->bridge.of_node = panel->dev->of_node; > #endif > + panel_bridge->bridge.ops = DRM_BRIDGE_OP_MODES; > + panel_bridge->bridge.type = connector_type; > > drm_bridge_add(&panel_bridge->bridge); >
diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c index 25c77cb24f42..cf4be369d75e 100644 --- a/drivers/gpu/drm/bridge/panel.c +++ b/drivers/gpu/drm/bridge/panel.c @@ -61,7 +61,7 @@ static int panel_bridge_attach(struct drm_bridge *bridge, int ret; if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) - return -EINVAL; + return 0; if (!bridge->encoder) { DRM_ERROR("Missing encoder\n"); @@ -124,6 +124,14 @@ static void panel_bridge_post_disable(struct drm_bridge *bridge) drm_panel_unprepare(panel_bridge->panel); } +static int panel_bridge_get_modes(struct drm_bridge *bridge, + struct drm_connector *connector) +{ + struct panel_bridge *panel_bridge = drm_bridge_to_panel_bridge(bridge); + + return drm_panel_get_modes(panel_bridge->panel, connector); +} + static const struct drm_bridge_funcs panel_bridge_bridge_funcs = { .attach = panel_bridge_attach, .detach = panel_bridge_detach, @@ -131,6 +139,7 @@ static const struct drm_bridge_funcs panel_bridge_bridge_funcs = { .enable = panel_bridge_enable, .disable = panel_bridge_disable, .post_disable = panel_bridge_post_disable, + .get_modes = panel_bridge_get_modes, }; /** @@ -200,6 +209,8 @@ struct drm_bridge *drm_panel_bridge_add_typed(struct drm_panel *panel, #ifdef CONFIG_OF panel_bridge->bridge.of_node = panel->dev->of_node; #endif + panel_bridge->bridge.ops = DRM_BRIDGE_OP_MODES; + panel_bridge->bridge.type = connector_type; drm_bridge_add(&panel_bridge->bridge);
Implement the newly added bridge connector operations, allowing the usage of drm_bridge_panel with drm_bridge_connector. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- Changes since v2: - Use the connector type from the panel instead of hardcoding it to DPI - Rebased on top top of Sam's panel .get_modes() rework --- drivers/gpu/drm/bridge/panel.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)