drm/bridge: ti-sn65dsi83: Replace connector format patching with atomic_get_input_bus_fmts
Subsystems (3)
PATCH 1/1 drm/bridge: ti-sn65dsi83: Replace connector format patching with atomic_get_input_bus_fmts
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.
--- drivers/gpu/drm/bridge/ti-sn65dsi83.c | 35 ++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-)
drivers/gpu/drm/bridge/ti-sn65dsi83.c +31 -4
@@ -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; +} +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)
Signature · 1 line
2.30.2
Hi Marek,
Thank you for the patch.
Quoted 64 lines · Marek Vasut
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 <[email protected]>Cc Adam Ford <[email protected]>Cc Douglas Anderson <[email protected]>Cc Frieder Schrempf <[email protected]>Cc Jagan Teki <[email protected]>Cc Laurent Pinchart <[email protected]>Cc Linus Walleij <[email protected]>Cc Loic Poulain <[email protected]>Cc Philippe Schenker <[email protected]>Cc Robert Foss <[email protected]>Cc Sam Ravnborg <[email protected]>Cc Stephen Boyd <[email protected]>Cc Valentin Raevsky <[email protected]>--- drivers/gpu/drm/bridge/ti-sn65dsi83.c | 35 ++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-)drivers/gpu/drm/bridge/ti-sn65dsi83.c +15
-4@@ -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),
drivers/gpu/drm/bridge/ti-sn65dsi83.c static bool sn65dsi83_mode_fixup(struct drm_bridge *bridge, · line 581
Quoted 10 lines
drivers/gpu/drm/bridge/ti-sn65dsi83.c +10
-0+ 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 :-)
Quoted 16 lines
drivers/gpu/drm/bridge/ti-sn65dsi83.c +6
-0+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)
Signature · 3 lines
Regards, Laurent Pinchart
Quoted 5 lines
Perfect :-)
Reviewed-by Laurent Pinchart <[email protected]>
Pulled into drm-misc-next.
https://cgit.freedesktop.org/drm/drm-misc/commit/?id=db8b7ca5b232083c82f627af7fe653d8074c5ca0