[PATCH] drm/bridge: ti-sn65dsi83: Replace connector format patching with atomic_get_input_bus_fmts

[Laurent Pinchart]

Hi Marek,

Thank you for the patch.

On Mon, Jun 21, 2021 at 12:42:08AM +0200, Marek Vasut wrote:
> Patching the connector format is causing various problematic
> side effects. Implement .atomic_get_input_bus_fmts callback
> instead, which sets up the input (DSI-end) format, and that
> format can then be used in pipeline format negotiation between
> the DSI-end of this bridge and the other component closer to
> the scanout engine.
> 
> Signed-off-by: Marek Vasut <marex at denx.de>
> Cc: Adam Ford <aford173 at gmail.com>
> Cc: Douglas Anderson <dianders at chromium.org>
> Cc: Frieder Schrempf <frieder.schrempf at kontron.de>
> Cc: Jagan Teki <jagan at amarulasolutions.com>
> Cc: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> Cc: Linus Walleij <linus.walleij at linaro.org>
> Cc: Loic Poulain <loic.poulain at linaro.org>
> Cc: Philippe Schenker <philippe.schenker at toradex.com>
> Cc: Robert Foss <robert.foss at linaro.org>
> Cc: Sam Ravnborg <sam at ravnborg.org>
> Cc: Stephen Boyd <swboyd at chromium.org>
> Cc: Valentin Raevsky <valentin at compulab.co.il>
> Cc: dri-devel at lists.freedesktop.org
> ---
>  drivers/gpu/drm/bridge/ti-sn65dsi83.c | 35 ++++++++++++++++++++++++---
>  1 file changed, 31 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi83.c b/drivers/gpu/drm/bridge/ti-sn65dsi83.c
> index 750f2172ef08..32bda20f5dda 100644
> --- a/drivers/gpu/drm/bridge/ti-sn65dsi83.c
> +++ b/drivers/gpu/drm/bridge/ti-sn65dsi83.c
> @@ -517,7 +517,6 @@ static bool sn65dsi83_mode_fixup(struct drm_bridge *bridge,
>  				 struct drm_display_mode *adj)
>  {
>  	struct sn65dsi83 *ctx = bridge_to_sn65dsi83(bridge);
> -	u32 input_bus_format = MEDIA_BUS_FMT_RGB888_1X24;
>  	struct drm_encoder *encoder = bridge->encoder;
>  	struct drm_device *ddev = encoder->dev;
>  	struct drm_connector *connector;
> @@ -550,14 +549,37 @@ static bool sn65dsi83_mode_fixup(struct drm_bridge *bridge,
>  				 connector->display_info.bus_formats[0]);
>  			break;
>  		}
> -
> -		drm_display_info_set_bus_formats(&connector->display_info,
> -						 &input_bus_format, 1);
>  	}
>  
>  	return true;
>  }
>  
> +#define MAX_INPUT_SEL_FORMATS	1
> +
> +static u32 *
> +sn65dsi83_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
> +				    struct drm_bridge_state *bridge_state,
> +				    struct drm_crtc_state *crtc_state,
> +				    struct drm_connector_state *conn_state,
> +				    u32 output_fmt,
> +				    unsigned int *num_input_fmts)
> +{
> +	u32 *input_fmts;
> +
> +	*num_input_fmts = 0;
> +
> +	input_fmts = kcalloc(MAX_INPUT_SEL_FORMATS, sizeof(*input_fmts),
> +			     GFP_KERNEL);
> +	if (!input_fmts)
> +		return NULL;
> +
> +	/* This is the DSI-end bus format */
> +	input_fmts[0] = MEDIA_BUS_FMT_RGB888_1X24;
> +	*num_input_fmts = 1;
> +
> +	return input_fmts;
> +}

Perfect :-)

Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

> +
>  static const struct drm_bridge_funcs sn65dsi83_funcs = {
>  	.attach		= sn65dsi83_attach,
>  	.pre_enable	= sn65dsi83_pre_enable,
> @@ -567,6 +589,11 @@ static const struct drm_bridge_funcs sn65dsi83_funcs = {
>  	.mode_valid	= sn65dsi83_mode_valid,
>  	.mode_set	= sn65dsi83_mode_set,
>  	.mode_fixup	= sn65dsi83_mode_fixup,
> +
> +	.atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
> +	.atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
> +	.atomic_reset = drm_atomic_helper_bridge_reset,
> +	.atomic_get_input_bus_fmts = sn65dsi83_atomic_get_input_bus_fmts,
>  };
>  
>  static int sn65dsi83_parse_dt(struct sn65dsi83 *ctx, enum sn65dsi83_model model)

-- 
Regards,

Laurent Pinchart