Commit fadf872d authored by Boris Brezillon's avatar Boris Brezillon

drm/bridge: Introduce drm_bridge_get_next_bridge()

And use it in drivers accessing the bridge->next field directly.
This is part of our attempt to make the bridge chain a double-linked list
based on the generic list helpers.
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191203141515.3597631-3-boris.brezillon@collabora.com
parent ea099adf
...@@ -171,7 +171,7 @@ void drm_encoder_cleanup(struct drm_encoder *encoder) ...@@ -171,7 +171,7 @@ void drm_encoder_cleanup(struct drm_encoder *encoder)
struct drm_bridge *next; struct drm_bridge *next;
while (bridge) { while (bridge) {
next = bridge->next; next = drm_bridge_get_next_bridge(bridge);
drm_bridge_detach(bridge); drm_bridge_detach(bridge);
bridge = next; bridge = next;
} }
......
...@@ -1238,16 +1238,18 @@ static int mtk_hdmi_conn_mode_valid(struct drm_connector *conn, ...@@ -1238,16 +1238,18 @@ static int mtk_hdmi_conn_mode_valid(struct drm_connector *conn,
struct drm_display_mode *mode) struct drm_display_mode *mode)
{ {
struct mtk_hdmi *hdmi = hdmi_ctx_from_conn(conn); struct mtk_hdmi *hdmi = hdmi_ctx_from_conn(conn);
struct drm_bridge *next_bridge;
dev_dbg(hdmi->dev, "xres=%d, yres=%d, refresh=%d, intl=%d clock=%d\n", dev_dbg(hdmi->dev, "xres=%d, yres=%d, refresh=%d, intl=%d clock=%d\n",
mode->hdisplay, mode->vdisplay, mode->vrefresh, mode->hdisplay, mode->vdisplay, mode->vrefresh,
!!(mode->flags & DRM_MODE_FLAG_INTERLACE), mode->clock * 1000); !!(mode->flags & DRM_MODE_FLAG_INTERLACE), mode->clock * 1000);
if (hdmi->bridge.next) { next_bridge = drm_bridge_get_next_bridge(&hdmi->bridge);
if (next_bridge) {
struct drm_display_mode adjusted_mode; struct drm_display_mode adjusted_mode;
drm_mode_copy(&adjusted_mode, mode); drm_mode_copy(&adjusted_mode, mode);
if (!drm_bridge_chain_mode_fixup(hdmi->bridge.next, mode, if (!drm_bridge_chain_mode_fixup(next_bridge, mode,
&adjusted_mode)) &adjusted_mode))
return MODE_BAD; return MODE_BAD;
} }
......
...@@ -217,8 +217,8 @@ static int omap_display_id(struct omap_dss_device *output) ...@@ -217,8 +217,8 @@ static int omap_display_id(struct omap_dss_device *output)
} else if (output->bridge) { } else if (output->bridge) {
struct drm_bridge *bridge = output->bridge; struct drm_bridge *bridge = output->bridge;
while (bridge->next) while (drm_bridge_get_next_bridge(bridge))
bridge = bridge->next; bridge = drm_bridge_get_next_bridge(bridge);
node = bridge->of_node; node = bridge->of_node;
} else if (output->panel) { } else if (output->panel) {
......
...@@ -126,7 +126,8 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder, ...@@ -126,7 +126,8 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder,
for (dssdev = output; dssdev; dssdev = dssdev->next) for (dssdev = output; dssdev; dssdev = dssdev->next)
omap_encoder_update_videomode_flags(&vm, dssdev->bus_flags); omap_encoder_update_videomode_flags(&vm, dssdev->bus_flags);
for (bridge = output->bridge; bridge; bridge = bridge->next) { for (bridge = output->bridge; bridge;
bridge = drm_bridge_get_next_bridge(bridge)) {
if (!bridge->timings) if (!bridge->timings)
continue; continue;
......
...@@ -409,6 +409,19 @@ struct drm_bridge *of_drm_find_bridge(struct device_node *np); ...@@ -409,6 +409,19 @@ struct drm_bridge *of_drm_find_bridge(struct device_node *np);
int drm_bridge_attach(struct drm_encoder *encoder, struct drm_bridge *bridge, int drm_bridge_attach(struct drm_encoder *encoder, struct drm_bridge *bridge,
struct drm_bridge *previous); struct drm_bridge *previous);
/**
* drm_bridge_get_next_bridge() - Get the next bridge in the chain
* @bridge: bridge object
*
* RETURNS:
* the next bridge in the chain after @bridge, or NULL if @bridge is the last.
*/
static inline struct drm_bridge *
drm_bridge_get_next_bridge(struct drm_bridge *bridge)
{
return bridge->next;
}
bool drm_bridge_chain_mode_fixup(struct drm_bridge *bridge, bool drm_bridge_chain_mode_fixup(struct drm_bridge *bridge,
const struct drm_display_mode *mode, const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode); struct drm_display_mode *adjusted_mode);
......
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