drm/bridge: ti-sn65dsi83: Replace connector format patching with atomic_get_input_bus...

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@denx.de>
Cc: Adam Ford <aford173@gmail.com>
Cc: Douglas Anderson <dianders@chromium.org>
Cc: Frieder Schrempf <frieder.schrempf@kontron.de>
Cc: Jagan Teki <jagan@amarulasolutions.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Loic Poulain <loic.poulain@linaro.org>
Cc: Philippe Schenker <philippe.schenker@toradex.com>
Cc: Robert Foss <robert.foss@linaro.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Stephen Boyd <swboyd@chromium.org>
Cc: Valentin Raevsky <valentin@compulab.co.il>
Cc: dri-devel@lists.freedesktop.org
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Robert Foss <robert.foss@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210620224208.184719-1-marex@denx.de

diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi83.c b/drivers/gpu/drm/bridge/ti-sn65dsi83.c
index 8f3158f5281a0f307a1d4e3ca83c32ad90a9c930..92408e5637fad6eb0724d5f05f6885dd86e3dc98 100644 (file)
--- a/drivers/gpu/drm/bridge/ti-sn65dsi83.c
+++ b/drivers/gpu/drm/bridge/ti-sn65dsi83.c
@@ -518,7 +518,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;
@@ -551,14 +550,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;
+}
+
 static const struct drm_bridge_funcs sn65dsi83_funcs = {
        .attach         = sn65dsi83_attach,
        .pre_enable     = sn65dsi83_pre_enable,
@@ -568,6 +590,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)