[PATCH v2 09/21] drm/bridge: Introduce drm_bridge_chain_get_next_bridge()
Neil Armstrong
narmstrong at baylibre.com
Tue Aug 27 07:19:45 UTC 2019
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 <narmstrong at baylibre.com>
>
> Signed-off-by: Boris Brezillon <boris.brezillon at collabora.com>
> ---
> 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(&hdmi->bridge);
> + if (next_bridge) {
> struct drm_display_mode adjusted_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))
> 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, &dev->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(&encoder->bridge);
> + if (bridge == first_bridge) {
> msm_edp_ctrl_timing_cfg(edp->ctrl,
> adjusted_mode, &connector->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(&vm, dssdev->bus_flags);
>
> - for (bridge = output->bridge; bridge; bridge = bridge->next) {
> + for (bridge = output->bridge; bridge;
> + bridge = drm_bridge_chain_get_next_bridge(bridge)) {
> if (!bridge->timings)
> continue;
>
> diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> index 1bd748202946..bcccdccd2878 100644
> --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> @@ -14,6 +14,7 @@
>
> #include <drm/drm_atomic.h>
> #include <drm/drm_atomic_helper.h>
> +#include <drm/drm_bridge.h>
> #include <drm/drm_crtc.h>
> #include <drm/drm_device.h>
> #include <drm/drm_fb_cma_helper.h>
> @@ -680,9 +681,10 @@ static void rcar_du_crtc_atomic_enable(struct drm_crtc *crtc,
> rcdu->encoders[RCAR_DU_OUTPUT_LVDS0 + rcrtc->index];
> const struct drm_display_mode *mode =
> &crtc->state->adjusted_mode;
> + struct drm_bridge *bridge;
>
> - rcar_lvds_clk_enable(encoder->base.bridge.next,
> - mode->clock * 1000);
> + bridge = drm_bridge_chain_get_next_bridge(&encoder->base.bridge);
> + rcar_lvds_clk_enable(bridge, mode->clock * 1000);
> }
>
> rcar_du_crtc_start(rcrtc);
> @@ -702,12 +704,14 @@ static void rcar_du_crtc_atomic_disable(struct drm_crtc *crtc,
> rstate->outputs == BIT(RCAR_DU_OUTPUT_DPAD0)) {
> struct rcar_du_encoder *encoder =
> rcdu->encoders[RCAR_DU_OUTPUT_LVDS0 + rcrtc->index];
> + struct drm_bridge *bridge;
>
> /*
> * Disable the LVDS clock output, see
> * rcar_du_crtc_atomic_enable().
> */
> - rcar_lvds_clk_disable(encoder->base.bridge.next);
> + bridge = drm_bridge_chain_get_next_bridge(&encoder->base.bridge);
> + rcar_lvds_clk_disable(bridge);
> }
>
> spin_lock_irq(&crtc->dev->event_lock);
> diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c
> index 4aa4c1a94f17..4ea352567cfb 100644
> --- a/drivers/gpu/drm/vc4/vc4_dsi.c
> +++ b/drivers/gpu/drm/vc4/vc4_dsi.c
> @@ -1636,8 +1636,10 @@ static void vc4_dsi_unbind(struct device *dev, struct device *master,
> struct drm_device *drm = dev_get_drvdata(master);
> struct vc4_dev *vc4 = to_vc4_dev(drm);
> struct vc4_dsi *dsi = dev_get_drvdata(dev);
> + struct drm_bridge *bridge;
>
> - if (dsi->encoder->bridge.next)
> + bridge = drm_bridge_chain_get_next_bridge(&dsi->encoder->bridge);
> + if (bridge)
> pm_runtime_disable(dev);
>
> vc4_dsi_encoder_destroy(dsi->encoder);
> diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h
> index 442a0654e1bf..7809fca99b2d 100644
> --- a/include/drm/drm_bridge.h
> +++ b/include/drm/drm_bridge.h
> @@ -409,6 +409,8 @@ struct drm_bridge *of_drm_find_bridge(struct device_node *np);
> int drm_bridge_attach(struct drm_encoder *encoder, struct drm_bridge *bridge,
> struct drm_bridge *previous);
>
> +struct drm_bridge *
> +drm_bridge_chain_get_next_bridge(struct drm_bridge *bridge);
> bool drm_bridge_chain_mode_fixup(struct drm_bridge *bridge,
> const struct drm_display_mode *mode,
> struct drm_display_mode *adjusted_mode);
>
More information about the dri-devel
mailing list