Re: [PATCH v2 09/21] drm/bridge: Introduce drm_bridge_chain_get_next_bridge()
On 26/08/2019 17:26, Boris Brezillon wrote:
> 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.
Reviewed-by: Neil Armstrong
>
> Signed-off-by: Boris Brezillon
> ---
> Changes in v2:
> * Kill the last/first helpers (they're not really needed)
> * Drop the !bridge || !bridge->encoder test
> ---
> drivers/gpu/drm/drm_bridge.c | 14 ++
> drivers/gpu/drm/mediatek/mtk_hdmi.c| 6 --
> drivers/gpu/drm/msm/edp/edp_bridge.c | 10 --
> drivers/gpu/drm/omapdrm/omap_drv.c | 4 ++--
> drivers/gpu/drm/omapdrm/omap_encoder.c | 3 ++-
> drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 10 +++---
> drivers/gpu/drm/vc4/vc4_dsi.c | 4 +++-
> include/drm/drm_bridge.h | 2 ++
> 8 files changed, 42 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c
> index 52f1263530b7..3d9a6c6a7d4e 100644
> --- a/drivers/gpu/drm/drm_bridge.c
> +++ b/drivers/gpu/drm/drm_bridge.c
> @@ -160,6 +160,20 @@ void drm_bridge_detach(struct drm_bridge *bridge)
> bridge->dev = NULL;
> }
>
> +/**
> + * drm_bridge_chain_get_next_bridge() - Get the next bridge in the chain
> + * @bridge: bridge object
> + *
> + * RETURNS:
> + * the next bridge in the chain, or NULL if @bridge is the last.
> + */
> +struct drm_bridge *
> +drm_bridge_chain_get_next_bridge(struct drm_bridge *bridge)
> +{
> + return bridge->next;
> +}
> +EXPORT_SYMBOL(drm_bridge_chain_get_next_bridge);
> +
> /**
> * DOC: bridge callbacks
> *
> diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c
> b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> index ea68b5adccbe..cfaa5aab8876 100644
> --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> @@ -1238,16 +1238,18 @@ static int mtk_hdmi_conn_mode_valid(struct
> drm_connector *conn,
> struct drm_display_mode *mode)
> {
> 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",
> mode->hdisplay, mode->vdisplay, mode->vrefresh,
> !!(mode->flags & DRM_MODE_FLAG_INTERLACE), mode->clock * 1000);
>
> - if (hdmi->bridge.next) {
> + next_bridge = drm_bridge_chain_get_next_bridge(>bridge);
> + if (next_bridge) {
> struct drm_display_mode adjusted_mode;
>
> drm_mode_copy(_mode, mode);
> - if (!drm_bridge_chain_mode_fixup(hdmi->bridge.next, mode,
> + if (!drm_bridge_chain_mode_fixup(next_bridge, mode,
>_mode))
> return MODE_BAD;
> }
> diff --git a/drivers/gpu/drm/msm/edp/edp_bridge.c
> b/drivers/gpu/drm/msm/edp/edp_bridge.c
> index 446acca110e9..772408c94643 100644
> --- a/drivers/gpu/drm/msm/edp/edp_bridge.c
> +++ b/drivers/gpu/drm/msm/edp/edp_bridge.c
> @@ -55,8 +55,14 @@ static void edp_bridge_mode_set(struct drm_bridge *bridge,
> DBG("set mode: " DRM_MODE_FMT, DRM_MODE_ARG(mode));
>
> list_for_each_entry(connector, >mode_config.connector_list, head) {
> - if ((connector->encoder != NULL) &&
> - (connector->encoder->bridge.next == bridge)) {
> + struct drm_encoder *encoder = connector->encoder;
> + struct drm_bridge *first_bridge;
> +
> + if (!encoder)
> + continue;
> +
> + first_bridge =
> drm_bridge_chain_get_next_bridge(>bridge);
> + if (bridge == first_bridge) {
> msm_edp_ctrl_timing_cfg(edp->ctrl,
> adjusted_mode, >display_info);
> break;
> diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c
> b/drivers/gpu/drm/omapdrm/omap_drv.c
> index 224ec6fdc800..ba59881bcf3f 100644
> --- a/drivers/gpu/drm/omapdrm/omap_drv.c
> +++ b/drivers/gpu/drm/omapdrm/omap_drv.c
> @@ -217,8 +217,8 @@ static int omap_display_id(struct omap_dss_device *output)
> } else if (output->bridge) {
> struct drm_bridge *bridge = output->bridge;
>
> - while (bridge->next)
> - bridge = bridge->next;
> + while (drm_bridge_chain_get_next_bridge(bridge))
> + bridge = drm_bridge_chain_get_next_bridge(bridge);
>
> node = bridge->of_node;
> } else if (output->panel) {
> diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c
> b/drivers/gpu/drm/omapdrm/omap_encoder.c
> index 24bbe9f2a32e..8ca54081997e 100644
> --- a/drivers/gpu/drm/omapdrm/omap_encoder.c
> +++ b/drivers/gpu/drm/omapdrm/omap_encoder.c
> @@ -126,7 +126,8 @@ static void omap_encoder_mode_set(struct drm_encoder
> *encoder,
> for (dssdev = output; dssdev; dssdev = dssdev->next)
>
[PATCH v2 09/21] drm/bridge: Introduce drm_bridge_chain_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: Boris Brezillon
---
Changes in v2:
* Kill the last/first helpers (they're not really needed)
* Drop the !bridge || !bridge->encoder test
---
drivers/gpu/drm/drm_bridge.c | 14 ++
drivers/gpu/drm/mediatek/mtk_hdmi.c| 6 --
drivers/gpu/drm/msm/edp/edp_bridge.c | 10 --
drivers/gpu/drm/omapdrm/omap_drv.c | 4 ++--
drivers/gpu/drm/omapdrm/omap_encoder.c | 3 ++-
drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 10 +++---
drivers/gpu/drm/vc4/vc4_dsi.c | 4 +++-
include/drm/drm_bridge.h | 2 ++
8 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c
index 52f1263530b7..3d9a6c6a7d4e 100644
--- a/drivers/gpu/drm/drm_bridge.c
+++ b/drivers/gpu/drm/drm_bridge.c
@@ -160,6 +160,20 @@ void drm_bridge_detach(struct drm_bridge *bridge)
bridge->dev = NULL;
}
+/**
+ * drm_bridge_chain_get_next_bridge() - Get the next bridge in the chain
+ * @bridge: bridge object
+ *
+ * RETURNS:
+ * the next bridge in the chain, or NULL if @bridge is the last.
+ */
+struct drm_bridge *
+drm_bridge_chain_get_next_bridge(struct drm_bridge *bridge)
+{
+ return bridge->next;
+}
+EXPORT_SYMBOL(drm_bridge_chain_get_next_bridge);
+
/**
* DOC: bridge callbacks
*
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c
b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index ea68b5adccbe..cfaa5aab8876 100644
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -1238,16 +1238,18 @@ static int mtk_hdmi_conn_mode_valid(struct
drm_connector *conn,
struct drm_display_mode *mode)
{
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",
mode->hdisplay, mode->vdisplay, mode->vrefresh,
!!(mode->flags & DRM_MODE_FLAG_INTERLACE), mode->clock * 1000);
- if (hdmi->bridge.next) {
+ next_bridge = drm_bridge_chain_get_next_bridge(>bridge);
+ if (next_bridge) {
struct drm_display_mode adjusted_mode;
drm_mode_copy(_mode, mode);
- if (!drm_bridge_chain_mode_fixup(hdmi->bridge.next, mode,
+ if (!drm_bridge_chain_mode_fixup(next_bridge, mode,
_mode))
return MODE_BAD;
}
diff --git a/drivers/gpu/drm/msm/edp/edp_bridge.c
b/drivers/gpu/drm/msm/edp/edp_bridge.c
index 446acca110e9..772408c94643 100644
--- a/drivers/gpu/drm/msm/edp/edp_bridge.c
+++ b/drivers/gpu/drm/msm/edp/edp_bridge.c
@@ -55,8 +55,14 @@ static void edp_bridge_mode_set(struct drm_bridge *bridge,
DBG("set mode: " DRM_MODE_FMT, DRM_MODE_ARG(mode));
list_for_each_entry(connector, >mode_config.connector_list, head) {
- if ((connector->encoder != NULL) &&
- (connector->encoder->bridge.next == bridge)) {
+ struct drm_encoder *encoder = connector->encoder;
+ struct drm_bridge *first_bridge;
+
+ if (!encoder)
+ continue;
+
+ first_bridge =
drm_bridge_chain_get_next_bridge(>bridge);
+ if (bridge == first_bridge) {
msm_edp_ctrl_timing_cfg(edp->ctrl,
adjusted_mode, >display_info);
break;
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c
b/drivers/gpu/drm/omapdrm/omap_drv.c
index 224ec6fdc800..ba59881bcf3f 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -217,8 +217,8 @@ static int omap_display_id(struct omap_dss_device *output)
} else if (output->bridge) {
struct drm_bridge *bridge = output->bridge;
- while (bridge->next)
- bridge = bridge->next;
+ while (drm_bridge_chain_get_next_bridge(bridge))
+ bridge = drm_bridge_chain_get_next_bridge(bridge);
node = bridge->of_node;
} else if (output->panel) {
diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c
b/drivers/gpu/drm/omapdrm/omap_encoder.c
index 24bbe9f2a32e..8ca54081997e 100644
--- a/drivers/gpu/drm/omapdrm/omap_encoder.c
+++ b/drivers/gpu/drm/omapdrm/omap_encoder.c
@@ -126,7 +126,8 @@ static void omap_encoder_mode_set(struct drm_encoder
*encoder,
for (dssdev = output; dssdev; dssdev = dssdev->next)
omap_encoder_update_videomode_flags(, dssdev->bus_flags);
- for (bridge = output->bridge; bridge; bridge = bridge->next) {
+ for (bridge = output->bridge; bridge;
+bridge = drm_bridge_chain_get_next_bridge(bridge)) {
