Hi,
On Tue, May 26, 2020 at 04:14:48AM +0300, Laurent Pinchart wrote:
> When validating a mode, bridges may need to do so in the context of a
> display, as specified by drm_display_info. An example is the meson
> dw-hdmi bridge that needs to consider the YUV 4:2:0 output format to
> perform clock calculations.
>
> Bridges that need the display info currently retrieve it from the
> drm_connector created by the bridge. This gets in the way of moving
> connector creation out of bridge drivers. To make this possible, pass
> the drm_display_info to drm_bridge_funcs .mode_valid().
>
> Changes to the bridge drivers have been performed with the following
> coccinelle semantic patch and have been compile-tested.
>
> @ rule1 @
> identifier funcs;
> identifier fn;
> @@
> struct drm_bridge_funcs funcs = {
> ...,
> .mode_valid = fn
> };
>
> @ depends on rule1 @
> identifier rule1.fn;
> identifier bridge;
> identifier mode;
> @@
> enum drm_mode_status fn(
> struct drm_bridge *bridge,
> + const struct drm_display_info *info,
> const struct drm_display_mode *mode
> )
> {
> ...
> }
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 1 +
> drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 1 +
> drivers/gpu/drm/bridge/cdns-dsi.c | 1 +
> drivers/gpu/drm/bridge/chrontel-ch7033.c | 1 +
> drivers/gpu/drm/bridge/nwl-dsi.c | 1 +
> drivers/gpu/drm/bridge/sii9234.c | 1 +
> drivers/gpu/drm/bridge/sil-sii8620.c | 1 +
> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 1 +
> drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 1 +
> drivers/gpu/drm/bridge/tc358767.c | 1 +
> drivers/gpu/drm/bridge/tc358768.c | 1 +
> drivers/gpu/drm/bridge/thc63lvd1024.c | 1 +
> drivers/gpu/drm/bridge/ti-tfp410.c | 1 +
> drivers/gpu/drm/drm_atomic_helper.c | 3 ++-
> drivers/gpu/drm/drm_bridge.c | 4 +++-
> drivers/gpu/drm/drm_probe_helper.c | 4 +++-
> drivers/gpu/drm/i2c/tda998x_drv.c | 1 +
> drivers/gpu/drm/omapdrm/dss/dpi.c | 1 +
> drivers/gpu/drm/omapdrm/dss/sdi.c | 1 +
> drivers/gpu/drm/omapdrm/dss/venc.c | 1 +
> include/drm/drm_bridge.h | 3 +++
> 21 files changed, 28 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
> index 2bc6e4f85171..371f4a9f866d 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
> @@ -585,6 +585,7 @@ static int anx6345_bridge_attach(struct drm_bridge *bridge,
>
> static enum drm_mode_status
> anx6345_bridge_mode_valid(struct drm_bridge *bridge,
> + const struct drm_display_info *info,
> const struct drm_display_mode *mode)
> {
> if (mode->flags & DRM_MODE_FLAG_INTERLACE)
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
> index 0d5a5ad0c9ee..81debd02c169 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
> @@ -944,6 +944,7 @@ static int anx78xx_bridge_attach(struct drm_bridge *bridge,
>
> static enum drm_mode_status
> anx78xx_bridge_mode_valid(struct drm_bridge *bridge,
> + const struct drm_display_info *info,
> const struct drm_display_mode *mode)
> {
> if (mode->flags & DRM_MODE_FLAG_INTERLACE)
> diff --git a/drivers/gpu/drm/bridge/cdns-dsi.c b/drivers/gpu/drm/bridge/cdns-dsi.c
> index 69c3892caee5..76373e31df92 100644
> --- a/drivers/gpu/drm/bridge/cdns-dsi.c
> +++ b/drivers/gpu/drm/bridge/cdns-dsi.c
> @@ -663,6 +663,7 @@ static int cdns_dsi_bridge_attach(struct drm_bridge *bridge,
>
> static enum drm_mode_status
> cdns_dsi_bridge_mode_valid(struct drm_bridge *bridge,
> + const struct drm_display_info *info,
> const struct drm_display_mode *mode)
> {
> struct cdns_dsi_input *input = bridge_to_cdns_dsi_input(bridge);
> diff --git a/drivers/gpu/drm/bridge/chrontel-ch7033.c b/drivers/gpu/drm/bridge/chrontel-ch7033.c
> index f8675d82974b..486f405c2e16 100644
> --- a/drivers/gpu/drm/bridge/chrontel-ch7033.c
> +++ b/drivers/gpu/drm/bridge/chrontel-ch7033.c
> @@ -317,6 +317,7 @@ static void ch7033_bridge_detach(struct drm_bridge *bridge)
> }
>
> static enum drm_mode_status ch7033_bridge_mode_valid(struct drm_bridge *bridge,
> + const struct drm_display_info *info,
> const struct drm_display_mode *mode)
> {
> if (mode->clock > 165000)
> diff --git a/drivers/gpu/drm/bridge/nwl-dsi.c b/drivers/gpu/drm/bridge/nwl-dsi.c
> index b14d725bf609..77a79af70914 100644
> --- a/drivers/gpu/drm/bridge/nwl-dsi.c
> +++ b/drivers/gpu/drm/bridge/nwl-dsi.c
> @@ -818,6 +818,7 @@ static bool nwl_dsi_bridge_mode_fixup(struct drm_bridge *bridge,
>
> static enum drm_mode_status
> nwl_dsi_bridge_mode_valid(struct drm_bridge *bridge,
> + const struct drm_display_info *info,
> const struct drm_display_mode *mode)
> {
> struct nwl_dsi *dsi = bridge_to_dsi(bridge);
> diff --git a/drivers/gpu/drm/bridge/sii9234.c b/drivers/gpu/drm/bridge/sii9234.c
> index b1258f0ed205..15c98a7bd81c 100644
> --- a/drivers/gpu/drm/bridge/sii9234.c
> +++ b/drivers/gpu/drm/bridge/sii9234.c
> @@ -873,6 +873,7 @@ static inline struct sii9234 *bridge_to_sii9234(struct drm_bridge *bridge)
> }
>
> static enum drm_mode_status sii9234_mode_valid(struct drm_bridge *bridge,
> + const struct drm_display_info *info,
> const struct drm_display_mode *mode)
> {
> if (mode->clock > MHL1_MAX_CLK)
> diff --git a/drivers/gpu/drm/bridge/sil-sii8620.c b/drivers/gpu/drm/bridge/sil-sii8620.c
> index 92acd336aa89..7c0c93c7e61f 100644
> --- a/drivers/gpu/drm/bridge/sil-sii8620.c
> +++ b/drivers/gpu/drm/bridge/sil-sii8620.c
> @@ -2244,6 +2244,7 @@ static int sii8620_is_packing_required(struct sii8620 *ctx,
> }
>
> static enum drm_mode_status sii8620_mode_valid(struct drm_bridge *bridge,
> + const struct drm_display_info *info,
> const struct drm_display_mode *mode)
> {
> struct sii8620 *ctx = bridge_to_sii8620(bridge);
> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> index 30681398cfb0..b535354150db 100644
> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> @@ -2767,6 +2767,7 @@ static void dw_hdmi_bridge_detach(struct drm_bridge *bridge)
>
> static enum drm_mode_status
> dw_hdmi_bridge_mode_valid(struct drm_bridge *bridge,
> + const struct drm_display_info *info,
> const struct drm_display_mode *mode)
> {
> struct dw_hdmi *hdmi = bridge->driver_private;
> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c
> index 5ef0f154aa7b..c223fb9a04cb 100644
> --- a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c
> @@ -924,6 +924,7 @@ static void dw_mipi_dsi_bridge_enable(struct drm_bridge *bridge)
>
> static enum drm_mode_status
> dw_mipi_dsi_bridge_mode_valid(struct drm_bridge *bridge,
> + const struct drm_display_info *info,
> const struct drm_display_mode *mode)
> {
> struct dw_mipi_dsi *dsi = bridge_to_dsi(bridge);
> diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c
> index e4c0ea03ae3a..c2777b226c75 100644
> --- a/drivers/gpu/drm/bridge/tc358767.c
> +++ b/drivers/gpu/drm/bridge/tc358767.c
> @@ -1306,6 +1306,7 @@ static bool tc_bridge_mode_fixup(struct drm_bridge *bridge,
> }
>
> static enum drm_mode_status tc_mode_valid(struct drm_bridge *bridge,
> + const struct drm_display_info *info,
> const struct drm_display_mode *mode)
> {
> struct tc_data *tc = bridge_to_tc(bridge);
> diff --git a/drivers/gpu/drm/bridge/tc358768.c b/drivers/gpu/drm/bridge/tc358768.c
> index 6650fe4cfc20..4a463fadf743 100644
> --- a/drivers/gpu/drm/bridge/tc358768.c
> +++ b/drivers/gpu/drm/bridge/tc358768.c
> @@ -529,6 +529,7 @@ static int tc358768_bridge_attach(struct drm_bridge *bridge,
>
> static enum drm_mode_status
> tc358768_bridge_mode_valid(struct drm_bridge *bridge,
> + const struct drm_display_info *info,
> const struct drm_display_mode *mode)
> {
> struct tc358768_priv *priv = bridge_to_tc358768(bridge);
> diff --git a/drivers/gpu/drm/bridge/thc63lvd1024.c b/drivers/gpu/drm/bridge/thc63lvd1024.c
> index 97d8129760e9..86b06975bfdd 100644
> --- a/drivers/gpu/drm/bridge/thc63lvd1024.c
> +++ b/drivers/gpu/drm/bridge/thc63lvd1024.c
> @@ -51,6 +51,7 @@ static int thc63_attach(struct drm_bridge *bridge,
> }
>
> static enum drm_mode_status thc63_mode_valid(struct drm_bridge *bridge,
> + const struct drm_display_info *info,
> const struct drm_display_mode *mode)
> {
> struct thc63_dev *thc63 = to_thc63(bridge);
> diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c
> index f065a96a0917..1f49aca06a9f 100644
> --- a/drivers/gpu/drm/bridge/ti-tfp410.c
> +++ b/drivers/gpu/drm/bridge/ti-tfp410.c
> @@ -192,6 +192,7 @@ static void tfp410_disable(struct drm_bridge *bridge)
> }
>
> static enum drm_mode_status tfp410_mode_valid(struct drm_bridge *bridge,
> + const struct drm_display_info *info,
> const struct drm_display_mode *mode)
> {
> if (mode->clock < 25000)
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index 85d163f16801..c1178518dc7a 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -506,7 +506,8 @@ static enum drm_mode_status mode_valid_path(struct drm_connector *connector,
> }
>
> bridge = drm_bridge_chain_get_first_bridge(encoder);
> - ret = drm_bridge_chain_mode_valid(bridge, mode);
> + ret = drm_bridge_chain_mode_valid(bridge, &connector->display_info,
> + mode);
> if (ret != MODE_OK) {
> DRM_DEBUG_ATOMIC("[BRIDGE] mode_valid() failed\n");
> return ret;
> diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c
> index fe1e3460b486..64f0effb52ac 100644
> --- a/drivers/gpu/drm/drm_bridge.c
> +++ b/drivers/gpu/drm/drm_bridge.c
> @@ -377,6 +377,7 @@ EXPORT_SYMBOL(drm_bridge_chain_mode_fixup);
> * drm_bridge_chain_mode_valid - validate the mode against all bridges in the
> * encoder chain.
> * @bridge: bridge control structure
> + * @info: display info against which the mode shall be validated
> * @mode: desired mode to be validated
> *
> * Calls &drm_bridge_funcs.mode_valid for all the bridges in the encoder
> @@ -390,6 +391,7 @@ EXPORT_SYMBOL(drm_bridge_chain_mode_fixup);
> */
> enum drm_mode_status
> drm_bridge_chain_mode_valid(struct drm_bridge *bridge,
> + const struct drm_display_info *info,
> const struct drm_display_mode *mode)
> {
> struct drm_encoder *encoder;
> @@ -404,7 +406,7 @@ drm_bridge_chain_mode_valid(struct drm_bridge *bridge,
> if (!bridge->funcs->mode_valid)
> continue;
>
> - ret = bridge->funcs->mode_valid(bridge, mode);
> + ret = bridge->funcs->mode_valid(bridge, info, mode);
> if (ret != MODE_OK)
> return ret;
> }
> diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
> index 576b4b7dcd89..f5d141e0400f 100644
> --- a/drivers/gpu/drm/drm_probe_helper.c
> +++ b/drivers/gpu/drm/drm_probe_helper.c
> @@ -114,7 +114,9 @@ drm_mode_validate_pipeline(struct drm_display_mode *mode,
> }
>
> bridge = drm_bridge_chain_get_first_bridge(encoder);
> - ret = drm_bridge_chain_mode_valid(bridge, mode);
> + ret = drm_bridge_chain_mode_valid(bridge,
> + &connector->display_info,
> + mode);
> if (ret != MODE_OK) {
> /* There is also no point in continuing for crtc check
> * here. */
> diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
> index 9517f522dcb9..50fd119a5276 100644
> --- a/drivers/gpu/drm/i2c/tda998x_drv.c
> +++ b/drivers/gpu/drm/i2c/tda998x_drv.c
> @@ -1379,6 +1379,7 @@ static void tda998x_bridge_detach(struct drm_bridge *bridge)
> }
>
> static enum drm_mode_status tda998x_bridge_mode_valid(struct drm_bridge *bridge,
> + const struct drm_display_info *info,
> const struct drm_display_mode *mode)
> {
> /* TDA19988 dotclock can go up to 165MHz */
> diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c
> index 5110acb0c6c1..1d2992daef40 100644
> --- a/drivers/gpu/drm/omapdrm/dss/dpi.c
> +++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
> @@ -434,6 +434,7 @@ static int dpi_bridge_attach(struct drm_bridge *bridge,
>
> static enum drm_mode_status
> dpi_bridge_mode_valid(struct drm_bridge *bridge,
> + const struct drm_display_info *info,
> const struct drm_display_mode *mode)
> {
> struct dpi_data *dpi = drm_bridge_to_dpi(bridge);
> diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
> index 417a8740ad0a..033fd30074b0 100644
> --- a/drivers/gpu/drm/omapdrm/dss/sdi.c
> +++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
> @@ -140,6 +140,7 @@ static int sdi_bridge_attach(struct drm_bridge *bridge,
>
> static enum drm_mode_status
> sdi_bridge_mode_valid(struct drm_bridge *bridge,
> + const struct drm_display_info *info,
> const struct drm_display_mode *mode)
> {
> struct sdi_device *sdi = drm_bridge_to_sdi(bridge);
> diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
> index 9701843ccf09..4406ce2a08b4 100644
> --- a/drivers/gpu/drm/omapdrm/dss/venc.c
> +++ b/drivers/gpu/drm/omapdrm/dss/venc.c
> @@ -548,6 +548,7 @@ static int venc_bridge_attach(struct drm_bridge *bridge,
>
> static enum drm_mode_status
> venc_bridge_mode_valid(struct drm_bridge *bridge,
> + const struct drm_display_info *info,
> const struct drm_display_mode *mode)
> {
> switch (venc_get_videomode(mode)) {
> diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h
> index ea2aa5ebae34..e3d7f36d8c39 100644
> --- a/include/drm/drm_bridge.h
> +++ b/include/drm/drm_bridge.h
> @@ -35,6 +35,7 @@
> struct drm_bridge;
> struct drm_bridge_timings;
> struct drm_connector;
> +struct drm_display_info;
> struct drm_panel;
> struct edid;
> struct i2c_adapter;
> @@ -112,6 +113,7 @@ struct drm_bridge_funcs {
> * drm_mode_status Enum
> */
> enum drm_mode_status (*mode_valid)(struct drm_bridge *bridge,
> + const struct drm_display_info *info,
> const struct drm_display_mode *mode);
>
> /**
> @@ -836,6 +838,7 @@ bool drm_bridge_chain_mode_fixup(struct drm_bridge *bridge,
> struct drm_display_mode *adjusted_mode);
> enum drm_mode_status
> drm_bridge_chain_mode_valid(struct drm_bridge *bridge,
> + const struct drm_display_info *info,
> const struct drm_display_mode *mode);
> void drm_bridge_chain_disable(struct drm_bridge *bridge);
> void drm_bridge_chain_post_disable(struct drm_bridge *bridge);
> --
> Regards,
>
> Laurent Pinchart
>
for the nwl-dsi part:
Reviewed-by: Guido Günther <agx@xxxxxxxxxxx>
