| Message ID | 20211122065223.88059-4-jagan@amarulasolutions.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
On Mon, Nov 22, 2021 at 12:22:19PM +0530, Jagan Teki wrote: > Some display panels would come up with a non-DSI output, those > can have an option to connect the DSI host by means of interface > bridge converter. > > This DSI to non-DSI interface bridge converter would requires > DSI Host to handle drm bridge functionalities in order to DSI > Host to Interface bridge. In order to do this you would need to use the DRM bridge API... > This patch convert the existing to a drm bridge driver with a > built-in encoder support for compatibility with existing > component drivers. ... but changing the encoder driver to a bridge is completely unnecessary to do so. Why did you need to make that change? > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > > --- > Changes for v5: > - add atomic APIs > - find host and device variant DSI devices. > Changes for v4, v3: > - none > > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 112 ++++++++++++++++++++----- > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 7 ++ > 2 files changed, 96 insertions(+), 23 deletions(-) > > diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > index 43d9c9e5198d..a6a272b55f77 100644 > --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > @@ -21,6 +21,7 @@ > > #include <drm/drm_atomic_helper.h> > #include <drm/drm_mipi_dsi.h> > +#include <drm/drm_of.h> > #include <drm/drm_panel.h> > #include <drm/drm_print.h> > #include <drm/drm_probe_helper.h> > @@ -713,10 +714,11 @@ static int sun6i_dsi_start(struct sun6i_dsi *dsi, > return 0; > } > > -static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > +static void sun6i_dsi_bridge_atomic_enable(struct drm_bridge *bridge, > + struct drm_bridge_state *old_bridge_state) > { > - struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > + struct drm_display_mode *mode = &bridge->encoder->crtc->state->adjusted_mode; > struct mipi_dsi_device *device = dsi->device; > union phy_configure_opts opts = { }; > struct phy_configure_opts_mipi_dphy *cfg = &opts.mipi_dphy; > @@ -772,6 +774,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > if (dsi->panel) > drm_panel_prepare(dsi->panel); > > + if (dsi->next_bridge) > + dsi->next_bridge->funcs->atomic_pre_enable(dsi->next_bridge, old_bridge_state); > + Please use the proper helpers. > /* > * FIXME: This should be moved after the switch to HS mode. > * > @@ -787,6 +792,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > if (dsi->panel) > drm_panel_enable(dsi->panel); > > + if (dsi->next_bridge) > + dsi->next_bridge->funcs->atomic_enable(dsi->next_bridge, old_bridge_state); > + Ditto > sun6i_dsi_start(dsi, DSI_START_HSC); > > udelay(1000); > @@ -794,15 +802,19 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > sun6i_dsi_start(dsi, DSI_START_HSD); > } > > -static void sun6i_dsi_encoder_disable(struct drm_encoder *encoder) > +static void sun6i_dsi_bridge_atomic_disable(struct drm_bridge *bridge, > + struct drm_bridge_state *old_bridge_state) > { > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > DRM_DEBUG_DRIVER("Disabling DSI output\n"); > > if (dsi->panel) { > drm_panel_disable(dsi->panel); > drm_panel_unprepare(dsi->panel); > + } else if (dsi->next_bridge) { > + dsi->next_bridge->funcs->atomic_disable(dsi->next_bridge, old_bridge_state); > + dsi->next_bridge->funcs->atomic_post_disable(dsi->next_bridge, old_bridge_state); Ditto > } > > phy_power_off(dsi->dphy); > @@ -842,9 +854,25 @@ static const struct drm_connector_funcs sun6i_dsi_connector_funcs = { > .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > }; > > -static const struct drm_encoder_helper_funcs sun6i_dsi_enc_helper_funcs = { > - .disable = sun6i_dsi_encoder_disable, > - .enable = sun6i_dsi_encoder_enable, > +static int sun6i_dsi_bridge_attach(struct drm_bridge *bridge, > + enum drm_bridge_attach_flags flags) > +{ > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > + > + if (dsi->next_bridge) > + return drm_bridge_attach(bridge->encoder, dsi->next_bridge, > + NULL, 0); > + > + return 0; > +} > + > +static const struct drm_bridge_funcs sun6i_dsi_bridge_funcs = { > + .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_enable = sun6i_dsi_bridge_atomic_enable, > + .atomic_disable = sun6i_dsi_bridge_atomic_disable, > + .attach = sun6i_dsi_bridge_attach, > }; > > static u32 sun6i_dsi_dcs_build_pkt_hdr(struct sun6i_dsi *dsi, > @@ -966,8 +994,6 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, > struct sun6i_dsi *dsi = dev_get_drvdata(dev); > int ret; > > - drm_encoder_helper_add(&dsi->encoder, > - &sun6i_dsi_enc_helper_funcs); > ret = drm_simple_encoder_init(drm, &dsi->encoder, > DRM_MODE_ENCODER_DSI); > if (ret) { > @@ -976,18 +1002,26 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, > } > dsi->encoder.possible_crtcs = BIT(0); > > - drm_connector_helper_add(&dsi->connector, > - &sun6i_dsi_connector_helper_funcs); > - ret = drm_connector_init(drm, &dsi->connector, > - &sun6i_dsi_connector_funcs, > - DRM_MODE_CONNECTOR_DSI); > + ret = drm_bridge_attach(&dsi->encoder, &dsi->bridge, NULL, 0); > if (ret) { > - dev_err(dsi->dev, > - "Couldn't initialise the DSI connector\n"); > + dev_err(dsi->dev, "Couldn't attach drm bridge\n"); > goto err_cleanup_connector; > } > > - drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); > + if (dsi->panel) { > + drm_connector_helper_add(&dsi->connector, > + &sun6i_dsi_connector_helper_funcs); > + ret = drm_connector_init(drm, &dsi->connector, > + &sun6i_dsi_connector_funcs, > + DRM_MODE_CONNECTOR_DSI); > + if (ret) { > + dev_err(dsi->dev, > + "Couldn't initialise the DSI connector\n"); > + goto err_cleanup_connector; > + } > + > + drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); > + } > > return 0; > > @@ -1013,16 +1047,46 @@ static int sun6i_dsi_attach(struct mipi_dsi_host *host, > struct mipi_dsi_device *device) > { > struct sun6i_dsi *dsi = host_to_sun6i_dsi(host); > - struct drm_panel *panel = of_drm_find_panel(device->dev.of_node); > + struct device_node *remote = device->dev.of_node; > int ret; > > - if (IS_ERR(panel)) > - return PTR_ERR(panel); > + if (!of_device_is_available(remote)) { > + /** > + * I2C interfaced DSI bridges will register DSI host on the > + * bridge drivers instead of conventional device. > + * > + * Those are probed via host of_node instead of device of_node. > + */ I have no idea what you mean here. Can you expand on what issue you've tried to solve here? > + remote = of_graph_get_remote_node(host->dev->of_node, 0, 0); > + if (!remote) > + return -ENODEV; > + } > + > + dsi->panel = of_drm_find_panel(remote); > + if (IS_ERR(dsi->panel)) { > + dsi->panel = NULL; > + > + dsi->next_bridge = of_drm_find_bridge(remote); > + if (IS_ERR(dsi->next_bridge)) { > + dev_err(dsi->dev, "failed to find bridge\n"); > + return PTR_ERR(dsi->next_bridge); > + } > + } else { > + dsi->next_bridge = NULL; > + } > + > + of_node_put(remote); Using devm_drm_of_get_bridge would greatly simplify the driver Maxime
Hi Maxime, On Mon, Nov 22, 2021 at 11:07:12AM +0100, Maxime Ripard wrote: > On Mon, Nov 22, 2021 at 12:22:19PM +0530, Jagan Teki wrote: > > Some display panels would come up with a non-DSI output, those > > can have an option to connect the DSI host by means of interface > > bridge converter. > > > > This DSI to non-DSI interface bridge converter would requires > > DSI Host to handle drm bridge functionalities in order to DSI > > Host to Interface bridge. > > In order to do this you would need to use the DRM bridge API... > > > This patch convert the existing to a drm bridge driver with a > > built-in encoder support for compatibility with existing > > component drivers. > > ... but changing the encoder driver to a bridge is completely > unnecessary to do so. Why did you need to make that change? > > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > > > > --- > > Changes for v5: > > - add atomic APIs > > - find host and device variant DSI devices. > > Changes for v4, v3: > > - none > > > > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 112 ++++++++++++++++++++----- > > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 7 ++ > > 2 files changed, 96 insertions(+), 23 deletions(-) > > > > diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > > index 43d9c9e5198d..a6a272b55f77 100644 > > --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > > +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > > @@ -21,6 +21,7 @@ > > > > #include <drm/drm_atomic_helper.h> > > #include <drm/drm_mipi_dsi.h> > > +#include <drm/drm_of.h> > > #include <drm/drm_panel.h> > > #include <drm/drm_print.h> > > #include <drm/drm_probe_helper.h> > > @@ -713,10 +714,11 @@ static int sun6i_dsi_start(struct sun6i_dsi *dsi, > > return 0; > > } > > > > -static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > +static void sun6i_dsi_bridge_atomic_enable(struct drm_bridge *bridge, > > + struct drm_bridge_state *old_bridge_state) > > { > > - struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; > > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > + struct drm_display_mode *mode = &bridge->encoder->crtc->state->adjusted_mode; > > struct mipi_dsi_device *device = dsi->device; > > union phy_configure_opts opts = { }; > > struct phy_configure_opts_mipi_dphy *cfg = &opts.mipi_dphy; > > @@ -772,6 +774,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > if (dsi->panel) > > drm_panel_prepare(dsi->panel); > > > > + if (dsi->next_bridge) > > + dsi->next_bridge->funcs->atomic_pre_enable(dsi->next_bridge, old_bridge_state); > > + > > Please use the proper helpers. I don't know about this series in particular, but overall we try to move encoders to bridge drivers in order to standardize on a single API. The drm_encoder can't be removed as it's exposed to userspace, so it then becomes a dumb encoder, without any operation implemented. > > /* > > * FIXME: This should be moved after the switch to HS mode. > > * > > @@ -787,6 +792,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > if (dsi->panel) > > drm_panel_enable(dsi->panel); > > > > + if (dsi->next_bridge) > > + dsi->next_bridge->funcs->atomic_enable(dsi->next_bridge, old_bridge_state); > > + > > Ditto > > > sun6i_dsi_start(dsi, DSI_START_HSC); > > > > udelay(1000); > > @@ -794,15 +802,19 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > sun6i_dsi_start(dsi, DSI_START_HSD); > > } > > > > -static void sun6i_dsi_encoder_disable(struct drm_encoder *encoder) > > +static void sun6i_dsi_bridge_atomic_disable(struct drm_bridge *bridge, > > + struct drm_bridge_state *old_bridge_state) > > { > > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > > > DRM_DEBUG_DRIVER("Disabling DSI output\n"); > > > > if (dsi->panel) { > > drm_panel_disable(dsi->panel); > > drm_panel_unprepare(dsi->panel); > > + } else if (dsi->next_bridge) { > > + dsi->next_bridge->funcs->atomic_disable(dsi->next_bridge, old_bridge_state); > > + dsi->next_bridge->funcs->atomic_post_disable(dsi->next_bridge, old_bridge_state); > > Ditto > > > } > > > > phy_power_off(dsi->dphy); > > @@ -842,9 +854,25 @@ static const struct drm_connector_funcs sun6i_dsi_connector_funcs = { > > .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > > }; > > > > -static const struct drm_encoder_helper_funcs sun6i_dsi_enc_helper_funcs = { > > - .disable = sun6i_dsi_encoder_disable, > > - .enable = sun6i_dsi_encoder_enable, > > +static int sun6i_dsi_bridge_attach(struct drm_bridge *bridge, > > + enum drm_bridge_attach_flags flags) > > +{ > > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > + > > + if (dsi->next_bridge) > > + return drm_bridge_attach(bridge->encoder, dsi->next_bridge, > > + NULL, 0); > > + > > + return 0; > > +} > > + > > +static const struct drm_bridge_funcs sun6i_dsi_bridge_funcs = { > > + .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_enable = sun6i_dsi_bridge_atomic_enable, > > + .atomic_disable = sun6i_dsi_bridge_atomic_disable, > > + .attach = sun6i_dsi_bridge_attach, > > }; > > > > static u32 sun6i_dsi_dcs_build_pkt_hdr(struct sun6i_dsi *dsi, > > @@ -966,8 +994,6 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, > > struct sun6i_dsi *dsi = dev_get_drvdata(dev); > > int ret; > > > > - drm_encoder_helper_add(&dsi->encoder, > > - &sun6i_dsi_enc_helper_funcs); > > ret = drm_simple_encoder_init(drm, &dsi->encoder, > > DRM_MODE_ENCODER_DSI); > > if (ret) { > > @@ -976,18 +1002,26 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, > > } > > dsi->encoder.possible_crtcs = BIT(0); > > > > - drm_connector_helper_add(&dsi->connector, > > - &sun6i_dsi_connector_helper_funcs); > > - ret = drm_connector_init(drm, &dsi->connector, > > - &sun6i_dsi_connector_funcs, > > - DRM_MODE_CONNECTOR_DSI); > > + ret = drm_bridge_attach(&dsi->encoder, &dsi->bridge, NULL, 0); > > if (ret) { > > - dev_err(dsi->dev, > > - "Couldn't initialise the DSI connector\n"); > > + dev_err(dsi->dev, "Couldn't attach drm bridge\n"); > > goto err_cleanup_connector; > > } > > > > - drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); > > + if (dsi->panel) { > > + drm_connector_helper_add(&dsi->connector, > > + &sun6i_dsi_connector_helper_funcs); > > + ret = drm_connector_init(drm, &dsi->connector, > > + &sun6i_dsi_connector_funcs, > > + DRM_MODE_CONNECTOR_DSI); > > + if (ret) { > > + dev_err(dsi->dev, > > + "Couldn't initialise the DSI connector\n"); > > + goto err_cleanup_connector; > > + } > > + > > + drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); > > + } > > > > return 0; > > > > @@ -1013,16 +1047,46 @@ static int sun6i_dsi_attach(struct mipi_dsi_host *host, > > struct mipi_dsi_device *device) > > { > > struct sun6i_dsi *dsi = host_to_sun6i_dsi(host); > > - struct drm_panel *panel = of_drm_find_panel(device->dev.of_node); > > + struct device_node *remote = device->dev.of_node; > > int ret; > > > > - if (IS_ERR(panel)) > > - return PTR_ERR(panel); > > + if (!of_device_is_available(remote)) { > > + /** > > + * I2C interfaced DSI bridges will register DSI host on the > > + * bridge drivers instead of conventional device. > > + * > > + * Those are probed via host of_node instead of device of_node. > > + */ > > I have no idea what you mean here. Can you expand on what issue you've > tried to solve here? > > > + remote = of_graph_get_remote_node(host->dev->of_node, 0, 0); > > + if (!remote) > > + return -ENODEV; > > + } > > + > > + dsi->panel = of_drm_find_panel(remote); > > + if (IS_ERR(dsi->panel)) { > > + dsi->panel = NULL; > > + > > + dsi->next_bridge = of_drm_find_bridge(remote); > > + if (IS_ERR(dsi->next_bridge)) { > > + dev_err(dsi->dev, "failed to find bridge\n"); > > + return PTR_ERR(dsi->next_bridge); > > + } > > + } else { > > + dsi->next_bridge = NULL; > > + } > > + > > + of_node_put(remote); > > Using devm_drm_of_get_bridge would greatly simplify the driver > > Maxime
On 22/11/2021 07:52, Jagan Teki wrote: > Some display panels would come up with a non-DSI output, those > can have an option to connect the DSI host by means of interface > bridge converter. > > This DSI to non-DSI interface bridge converter would requires > DSI Host to handle drm bridge functionalities in order to DSI > Host to Interface bridge. > > This patch convert the existing to a drm bridge driver with a > built-in encoder support for compatibility with existing > component drivers. > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > --- > Changes for v5: > - add atomic APIs > - find host and device variant DSI devices. > Changes for v4, v3: > - none > > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 112 ++++++++++++++++++++----- > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 7 ++ > 2 files changed, 96 insertions(+), 23 deletions(-) > > diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > index 43d9c9e5198d..a6a272b55f77 100644 > --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > @@ -21,6 +21,7 @@ > > #include <drm/drm_atomic_helper.h> > #include <drm/drm_mipi_dsi.h> > +#include <drm/drm_of.h> > #include <drm/drm_panel.h> > #include <drm/drm_print.h> > #include <drm/drm_probe_helper.h> > @@ -713,10 +714,11 @@ static int sun6i_dsi_start(struct sun6i_dsi *dsi, > return 0; > } > > -static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > +static void sun6i_dsi_bridge_atomic_enable(struct drm_bridge *bridge, > + struct drm_bridge_state *old_bridge_state) > { > - struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > + struct drm_display_mode *mode = &bridge->encoder->crtc->state->adjusted_mode; > struct mipi_dsi_device *device = dsi->device; > union phy_configure_opts opts = { }; > struct phy_configure_opts_mipi_dphy *cfg = &opts.mipi_dphy; > @@ -772,6 +774,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > if (dsi->panel) > drm_panel_prepare(dsi->panel); > > + if (dsi->next_bridge) > + dsi->next_bridge->funcs->atomic_pre_enable(dsi->next_bridge, old_bridge_state); > + > /* > * FIXME: This should be moved after the switch to HS mode. > * > @@ -787,6 +792,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > if (dsi->panel) > drm_panel_enable(dsi->panel); > > + if (dsi->next_bridge) > + dsi->next_bridge->funcs->atomic_enable(dsi->next_bridge, old_bridge_state); > + No need to call the next bridge atomic pre_enable/enable/disable/post_disable since they will be called automatically on the bridge chain. > sun6i_dsi_start(dsi, DSI_START_HSC); > > udelay(1000); > @@ -794,15 +802,19 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > sun6i_dsi_start(dsi, DSI_START_HSD); > } > > -static void sun6i_dsi_encoder_disable(struct drm_encoder *encoder) > +static void sun6i_dsi_bridge_atomic_disable(struct drm_bridge *bridge, > + struct drm_bridge_state *old_bridge_state) > { > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > DRM_DEBUG_DRIVER("Disabling DSI output\n"); > > if (dsi->panel) { > drm_panel_disable(dsi->panel); > drm_panel_unprepare(dsi->panel); > + } else if (dsi->next_bridge) { > + dsi->next_bridge->funcs->atomic_disable(dsi->next_bridge, old_bridge_state); > + dsi->next_bridge->funcs->atomic_post_disable(dsi->next_bridge, old_bridge_state); Ditto > } > > phy_power_off(dsi->dphy); > @@ -842,9 +854,25 @@ static const struct drm_connector_funcs sun6i_dsi_connector_funcs = { > .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > }; > > -static const struct drm_encoder_helper_funcs sun6i_dsi_enc_helper_funcs = { > - .disable = sun6i_dsi_encoder_disable, > - .enable = sun6i_dsi_encoder_enable, > +static int sun6i_dsi_bridge_attach(struct drm_bridge *bridge, > + enum drm_bridge_attach_flags flags) > +{ > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > + > + if (dsi->next_bridge) > + return drm_bridge_attach(bridge->encoder, dsi->next_bridge, > + NULL, 0); > + > + return 0; > +} > + > +static const struct drm_bridge_funcs sun6i_dsi_bridge_funcs = { > + .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_enable = sun6i_dsi_bridge_atomic_enable, > + .atomic_disable = sun6i_dsi_bridge_atomic_disable, > + .attach = sun6i_dsi_bridge_attach, > }; > > static u32 sun6i_dsi_dcs_build_pkt_hdr(struct sun6i_dsi *dsi, > @@ -966,8 +994,6 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, > struct sun6i_dsi *dsi = dev_get_drvdata(dev); > int ret; > > - drm_encoder_helper_add(&dsi->encoder, > - &sun6i_dsi_enc_helper_funcs); > ret = drm_simple_encoder_init(drm, &dsi->encoder, > DRM_MODE_ENCODER_DSI); > if (ret) { > @@ -976,18 +1002,26 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, > } > dsi->encoder.possible_crtcs = BIT(0); > > - drm_connector_helper_add(&dsi->connector, > - &sun6i_dsi_connector_helper_funcs); > - ret = drm_connector_init(drm, &dsi->connector, > - &sun6i_dsi_connector_funcs, > - DRM_MODE_CONNECTOR_DSI); > + ret = drm_bridge_attach(&dsi->encoder, &dsi->bridge, NULL, 0); > if (ret) { > - dev_err(dsi->dev, > - "Couldn't initialise the DSI connector\n"); > + dev_err(dsi->dev, "Couldn't attach drm bridge\n"); > goto err_cleanup_connector; > } > > - drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); > + if (dsi->panel) { > + drm_connector_helper_add(&dsi->connector, > + &sun6i_dsi_connector_helper_funcs); > + ret = drm_connector_init(drm, &dsi->connector, > + &sun6i_dsi_connector_funcs, > + DRM_MODE_CONNECTOR_DSI); > + if (ret) { > + dev_err(dsi->dev, > + "Couldn't initialise the DSI connector\n"); > + goto err_cleanup_connector; > + } > + > + drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); > + } > > return 0; > > @@ -1013,16 +1047,46 @@ static int sun6i_dsi_attach(struct mipi_dsi_host *host, > struct mipi_dsi_device *device) > { > struct sun6i_dsi *dsi = host_to_sun6i_dsi(host); > - struct drm_panel *panel = of_drm_find_panel(device->dev.of_node); > + struct device_node *remote = device->dev.of_node; > int ret; > > - if (IS_ERR(panel)) > - return PTR_ERR(panel); > + if (!of_device_is_available(remote)) { > + /** > + * I2C interfaced DSI bridges will register DSI host on the > + * bridge drivers instead of conventional device. > + * > + * Those are probed via host of_node instead of device of_node. > + */ > + remote = of_graph_get_remote_node(host->dev->of_node, 0, 0); > + if (!remote) > + return -ENODEV; > + } > + > + dsi->panel = of_drm_find_panel(remote); > + if (IS_ERR(dsi->panel)) { > + dsi->panel = NULL; > + > + dsi->next_bridge = of_drm_find_bridge(remote); > + if (IS_ERR(dsi->next_bridge)) { > + dev_err(dsi->dev, "failed to find bridge\n"); > + return PTR_ERR(dsi->next_bridge); > + } > + } else { > + dsi->next_bridge = NULL; > + } > + > + of_node_put(remote); > > - dsi->panel = panel; > dsi->device = device; > > - dev_info(host->dev, "Attached device %s\n", device->name); > + dev_info(host->dev, "Attached %s %s\n", > + device->name, dsi->panel ? "panel" : "bridge"); > + > + dsi->bridge.funcs = &sun6i_dsi_bridge_funcs; > + dsi->bridge.of_node = dsi->dev->of_node; > + dsi->bridge.type = DRM_MODE_CONNECTOR_DSI; > + > + drm_bridge_add(&dsi->bridge); > > ret = component_add(dsi->dev, &sun6i_dsi_ops); > if (ret) { > @@ -1040,9 +1104,11 @@ static int sun6i_dsi_detach(struct mipi_dsi_host *host, > struct sun6i_dsi *dsi = host_to_sun6i_dsi(host); > > dsi->panel = NULL; > + dsi->next_bridge = NULL; > dsi->device = NULL; > > component_del(dsi->dev, &sun6i_dsi_ops); > + drm_bridge_remove(&dsi->bridge); > > return 0; > } > diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h > index 61e88ea6044d..d269304691c9 100644 > --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h > +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h > @@ -16,6 +16,7 @@ > #define SUN6I_DSI_TCON_DIV 4 > > struct sun6i_dsi { > + struct drm_bridge bridge; > struct drm_connector connector; > struct drm_encoder encoder; > struct mipi_dsi_host host; > @@ -30,6 +31,7 @@ struct sun6i_dsi { > struct device *dev; > struct mipi_dsi_device *device; > struct drm_panel *panel; > + struct drm_bridge *next_bridge; > }; > > static inline struct sun6i_dsi *host_to_sun6i_dsi(struct mipi_dsi_host *host) > @@ -37,6 +39,11 @@ static inline struct sun6i_dsi *host_to_sun6i_dsi(struct mipi_dsi_host *host) > return container_of(host, struct sun6i_dsi, host); > }; > > +static inline struct sun6i_dsi *bridge_to_sun6i_dsi(struct drm_bridge *bridge) > +{ > + return container_of(bridge, struct sun6i_dsi, bridge); > +} > + > static inline struct sun6i_dsi *connector_to_sun6i_dsi(struct drm_connector *connector) > { > return container_of(connector, struct sun6i_dsi, connector); >
Hi Neil, On Mon, Nov 22, 2021 at 6:22 PM Neil Armstrong <narmstrong@baylibre.com> wrote: > > On 22/11/2021 07:52, Jagan Teki wrote: > > Some display panels would come up with a non-DSI output, those > > can have an option to connect the DSI host by means of interface > > bridge converter. > > > > This DSI to non-DSI interface bridge converter would requires > > DSI Host to handle drm bridge functionalities in order to DSI > > Host to Interface bridge. > > > > This patch convert the existing to a drm bridge driver with a > > built-in encoder support for compatibility with existing > > component drivers. > > > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > > --- > > Changes for v5: > > - add atomic APIs > > - find host and device variant DSI devices. > > Changes for v4, v3: > > - none > > > > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 112 ++++++++++++++++++++----- > > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 7 ++ > > 2 files changed, 96 insertions(+), 23 deletions(-) > > > > diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > > index 43d9c9e5198d..a6a272b55f77 100644 > > --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > > +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > > @@ -21,6 +21,7 @@ > > > > #include <drm/drm_atomic_helper.h> > > #include <drm/drm_mipi_dsi.h> > > +#include <drm/drm_of.h> > > #include <drm/drm_panel.h> > > #include <drm/drm_print.h> > > #include <drm/drm_probe_helper.h> > > @@ -713,10 +714,11 @@ static int sun6i_dsi_start(struct sun6i_dsi *dsi, > > return 0; > > } > > > > -static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > +static void sun6i_dsi_bridge_atomic_enable(struct drm_bridge *bridge, > > + struct drm_bridge_state *old_bridge_state) > > { > > - struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; > > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > + struct drm_display_mode *mode = &bridge->encoder->crtc->state->adjusted_mode; > > struct mipi_dsi_device *device = dsi->device; > > union phy_configure_opts opts = { }; > > struct phy_configure_opts_mipi_dphy *cfg = &opts.mipi_dphy; > > @@ -772,6 +774,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > if (dsi->panel) > > drm_panel_prepare(dsi->panel); > > > > + if (dsi->next_bridge) > > + dsi->next_bridge->funcs->atomic_pre_enable(dsi->next_bridge, old_bridge_state); > > + > > /* > > * FIXME: This should be moved after the switch to HS mode. > > * > > @@ -787,6 +792,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > if (dsi->panel) > > drm_panel_enable(dsi->panel); > > > > + if (dsi->next_bridge) > > + dsi->next_bridge->funcs->atomic_enable(dsi->next_bridge, old_bridge_state); > > + > > > No need to call the next bridge atomic pre_enable/enable/disable/post_disable since they will > be called automatically on the bridge chain. Correct, but the existing bridge chain (stack) is not compatible with sun6i DSI start sequence. We cannot send any DCS once we start HS mode. https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c#n775 This specific problem can be fixed only if we change the bridge chain from stack to queue. Please check this series https://patchwork.kernel.org/project/dri-devel/patch/20210214194102.126146-6-jagan@amarulasolutions.com/ Jagan.
Hi Maxime, On Mon, Nov 22, 2021 at 3:37 PM Maxime Ripard <maxime@cerno.tech> wrote: > > On Mon, Nov 22, 2021 at 12:22:19PM +0530, Jagan Teki wrote: > > Some display panels would come up with a non-DSI output, those > > can have an option to connect the DSI host by means of interface > > bridge converter. > > > > This DSI to non-DSI interface bridge converter would requires > > DSI Host to handle drm bridge functionalities in order to DSI > > Host to Interface bridge. > > In order to do this you would need to use the DRM bridge API... Sorry, which bridge API do you mean? > > > This patch convert the existing to a drm bridge driver with a > > built-in encoder support for compatibility with existing > > component drivers. > > ... but changing the encoder driver to a bridge is completely > unnecessary to do so. Why did you need to make that change? Idea of this series is to convert the driver to bridge and use the latest bridge function from the v1 series. > > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > > > > --- > > Changes for v5: > > - add atomic APIs > > - find host and device variant DSI devices. > > Changes for v4, v3: > > - none > > > > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 112 ++++++++++++++++++++----- > > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 7 ++ > > 2 files changed, 96 insertions(+), 23 deletions(-) > > > > diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > > index 43d9c9e5198d..a6a272b55f77 100644 > > --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > > +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > > @@ -21,6 +21,7 @@ > > > > #include <drm/drm_atomic_helper.h> > > #include <drm/drm_mipi_dsi.h> > > +#include <drm/drm_of.h> > > #include <drm/drm_panel.h> > > #include <drm/drm_print.h> > > #include <drm/drm_probe_helper.h> > > @@ -713,10 +714,11 @@ static int sun6i_dsi_start(struct sun6i_dsi *dsi, > > return 0; > > } > > > > -static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > +static void sun6i_dsi_bridge_atomic_enable(struct drm_bridge *bridge, > > + struct drm_bridge_state *old_bridge_state) > > { > > - struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; > > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > + struct drm_display_mode *mode = &bridge->encoder->crtc->state->adjusted_mode; > > struct mipi_dsi_device *device = dsi->device; > > union phy_configure_opts opts = { }; > > struct phy_configure_opts_mipi_dphy *cfg = &opts.mipi_dphy; > > @@ -772,6 +774,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > if (dsi->panel) > > drm_panel_prepare(dsi->panel); > > > > + if (dsi->next_bridge) > > + dsi->next_bridge->funcs->atomic_pre_enable(dsi->next_bridge, old_bridge_state); > > + > > Please use the proper helpers. If we use bridge_functions we need to take atomic functions as precedence as the next bridge functions might convert atomic calls. > > > /* > > * FIXME: This should be moved after the switch to HS mode. > > * > > @@ -787,6 +792,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > if (dsi->panel) > > drm_panel_enable(dsi->panel); > > > > + if (dsi->next_bridge) > > + dsi->next_bridge->funcs->atomic_enable(dsi->next_bridge, old_bridge_state); > > + > > Ditto > > > sun6i_dsi_start(dsi, DSI_START_HSC); > > > > udelay(1000); > > @@ -794,15 +802,19 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > sun6i_dsi_start(dsi, DSI_START_HSD); > > } > > > > -static void sun6i_dsi_encoder_disable(struct drm_encoder *encoder) > > +static void sun6i_dsi_bridge_atomic_disable(struct drm_bridge *bridge, > > + struct drm_bridge_state *old_bridge_state) > > { > > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > > > DRM_DEBUG_DRIVER("Disabling DSI output\n"); > > > > if (dsi->panel) { > > drm_panel_disable(dsi->panel); > > drm_panel_unprepare(dsi->panel); > > + } else if (dsi->next_bridge) { > > + dsi->next_bridge->funcs->atomic_disable(dsi->next_bridge, old_bridge_state); > > + dsi->next_bridge->funcs->atomic_post_disable(dsi->next_bridge, old_bridge_state); > > Ditto > > > } > > > > phy_power_off(dsi->dphy); > > @@ -842,9 +854,25 @@ static const struct drm_connector_funcs sun6i_dsi_connector_funcs = { > > .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > > }; > > > > -static const struct drm_encoder_helper_funcs sun6i_dsi_enc_helper_funcs = { > > - .disable = sun6i_dsi_encoder_disable, > > - .enable = sun6i_dsi_encoder_enable, > > +static int sun6i_dsi_bridge_attach(struct drm_bridge *bridge, > > + enum drm_bridge_attach_flags flags) > > +{ > > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > + > > + if (dsi->next_bridge) > > + return drm_bridge_attach(bridge->encoder, dsi->next_bridge, > > + NULL, 0); > > + > > + return 0; > > +} > > + > > +static const struct drm_bridge_funcs sun6i_dsi_bridge_funcs = { > > + .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_enable = sun6i_dsi_bridge_atomic_enable, > > + .atomic_disable = sun6i_dsi_bridge_atomic_disable, > > + .attach = sun6i_dsi_bridge_attach, > > }; > > > > static u32 sun6i_dsi_dcs_build_pkt_hdr(struct sun6i_dsi *dsi, > > @@ -966,8 +994,6 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, > > struct sun6i_dsi *dsi = dev_get_drvdata(dev); > > int ret; > > > > - drm_encoder_helper_add(&dsi->encoder, > > - &sun6i_dsi_enc_helper_funcs); > > ret = drm_simple_encoder_init(drm, &dsi->encoder, > > DRM_MODE_ENCODER_DSI); > > if (ret) { > > @@ -976,18 +1002,26 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, > > } > > dsi->encoder.possible_crtcs = BIT(0); > > > > - drm_connector_helper_add(&dsi->connector, > > - &sun6i_dsi_connector_helper_funcs); > > - ret = drm_connector_init(drm, &dsi->connector, > > - &sun6i_dsi_connector_funcs, > > - DRM_MODE_CONNECTOR_DSI); > > + ret = drm_bridge_attach(&dsi->encoder, &dsi->bridge, NULL, 0); > > if (ret) { > > - dev_err(dsi->dev, > > - "Couldn't initialise the DSI connector\n"); > > + dev_err(dsi->dev, "Couldn't attach drm bridge\n"); > > goto err_cleanup_connector; > > } > > > > - drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); > > + if (dsi->panel) { > > + drm_connector_helper_add(&dsi->connector, > > + &sun6i_dsi_connector_helper_funcs); > > + ret = drm_connector_init(drm, &dsi->connector, > > + &sun6i_dsi_connector_funcs, > > + DRM_MODE_CONNECTOR_DSI); > > + if (ret) { > > + dev_err(dsi->dev, > > + "Couldn't initialise the DSI connector\n"); > > + goto err_cleanup_connector; > > + } > > + > > + drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); > > + } > > > > return 0; > > > > @@ -1013,16 +1047,46 @@ static int sun6i_dsi_attach(struct mipi_dsi_host *host, > > struct mipi_dsi_device *device) > > { > > struct sun6i_dsi *dsi = host_to_sun6i_dsi(host); > > - struct drm_panel *panel = of_drm_find_panel(device->dev.of_node); > > + struct device_node *remote = device->dev.of_node; > > int ret; > > > > - if (IS_ERR(panel)) > > - return PTR_ERR(panel); > > + if (!of_device_is_available(remote)) { > > + /** > > + * I2C interfaced DSI bridges will register DSI host on the > > + * bridge drivers instead of conventional device. > > + * > > + * Those are probed via host of_node instead of device of_node. > > + */ > > I have no idea what you mean here. Can you expand on what issue you've > tried to solve here? I2C interface DSI bridges will register DSI host on the bridge drivers. Those can be found using host->dev->of_node and cannot be find using device->dev.of_node > > > + remote = of_graph_get_remote_node(host->dev->of_node, 0, 0); > > + if (!remote) > > + return -ENODEV; > > + } > > + > > + dsi->panel = of_drm_find_panel(remote); > > + if (IS_ERR(dsi->panel)) { > > + dsi->panel = NULL; > > + > > + dsi->next_bridge = of_drm_find_bridge(remote); > > + if (IS_ERR(dsi->next_bridge)) { > > + dev_err(dsi->dev, "failed to find bridge\n"); > > + return PTR_ERR(dsi->next_bridge); > > + } > > + } else { > > + dsi->next_bridge = NULL; > > + } > > + > > + of_node_put(remote); > > Using devm_drm_of_get_bridge would greatly simplify the driver I'm aware of this and this would break the existing sunxi dsi binding, we are not using ports based pipeline in dsi node. Of-course you have pointed the same before, please check below https://patchwork.kernel.org/project/dri-devel/patch/20210322140152.101709-2-jagan@amarulasolutions.com/ Jagan.
On Mon, Nov 22, 2021 at 07:18:13PM +0530, Jagan Teki wrote: > Hi Maxime, > > On Mon, Nov 22, 2021 at 3:37 PM Maxime Ripard <maxime@cerno.tech> wrote: > > > > On Mon, Nov 22, 2021 at 12:22:19PM +0530, Jagan Teki wrote: > > > Some display panels would come up with a non-DSI output, those > > > can have an option to connect the DSI host by means of interface > > > bridge converter. > > > > > > This DSI to non-DSI interface bridge converter would requires > > > DSI Host to handle drm bridge functionalities in order to DSI > > > Host to Interface bridge. > > > > In order to do this you would need to use the DRM bridge API... > > Sorry, which bridge API do you mean? Any variant of of_drm_find_bridge, and drm_bridge_attach. Just like we're doing in sun4i_rgb.c > > > This patch convert the existing to a drm bridge driver with a > > > built-in encoder support for compatibility with existing > > > component drivers. > > > > ... but changing the encoder driver to a bridge is completely > > unnecessary to do so. Why did you need to make that change? > > Idea of this series is to convert the driver to bridge and use the > latest bridge function from the v1 series. Ok, but it's not at all what you mention in your commit log? You don't need any of that in order to support a bridge downstream. > > > > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > > > > > > --- > > > Changes for v5: > > > - add atomic APIs > > > - find host and device variant DSI devices. > > > Changes for v4, v3: > > > - none > > > > > > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 112 ++++++++++++++++++++----- > > > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 7 ++ > > > 2 files changed, 96 insertions(+), 23 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > > > index 43d9c9e5198d..a6a272b55f77 100644 > > > --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > > > +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > > > @@ -21,6 +21,7 @@ > > > > > > #include <drm/drm_atomic_helper.h> > > > #include <drm/drm_mipi_dsi.h> > > > +#include <drm/drm_of.h> > > > #include <drm/drm_panel.h> > > > #include <drm/drm_print.h> > > > #include <drm/drm_probe_helper.h> > > > @@ -713,10 +714,11 @@ static int sun6i_dsi_start(struct sun6i_dsi *dsi, > > > return 0; > > > } > > > > > > -static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > > +static void sun6i_dsi_bridge_atomic_enable(struct drm_bridge *bridge, > > > + struct drm_bridge_state *old_bridge_state) > > > { > > > - struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; > > > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > > > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > > + struct drm_display_mode *mode = &bridge->encoder->crtc->state->adjusted_mode; > > > struct mipi_dsi_device *device = dsi->device; > > > union phy_configure_opts opts = { }; > > > struct phy_configure_opts_mipi_dphy *cfg = &opts.mipi_dphy; > > > @@ -772,6 +774,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > > if (dsi->panel) > > > drm_panel_prepare(dsi->panel); > > > > > > + if (dsi->next_bridge) > > > + dsi->next_bridge->funcs->atomic_pre_enable(dsi->next_bridge, old_bridge_state); > > > + > > > > Please use the proper helpers. > > If we use bridge_functions we need to take atomic functions as > precedence as the next bridge functions might convert atomic calls. We've had this discussion over and over again, but this is something that needs to be documented and / or in your commit log. You must not deviate from the standard (and expected) behavior without any kind of justification. > > > > > /* > > > * FIXME: This should be moved after the switch to HS mode. > > > * > > > @@ -787,6 +792,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > > if (dsi->panel) > > > drm_panel_enable(dsi->panel); > > > > > > + if (dsi->next_bridge) > > > + dsi->next_bridge->funcs->atomic_enable(dsi->next_bridge, old_bridge_state); > > > + > > > > Ditto > > > > > sun6i_dsi_start(dsi, DSI_START_HSC); > > > > > > udelay(1000); > > > @@ -794,15 +802,19 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > > sun6i_dsi_start(dsi, DSI_START_HSD); > > > } > > > > > > -static void sun6i_dsi_encoder_disable(struct drm_encoder *encoder) > > > +static void sun6i_dsi_bridge_atomic_disable(struct drm_bridge *bridge, > > > + struct drm_bridge_state *old_bridge_state) > > > { > > > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > > > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > > > > > DRM_DEBUG_DRIVER("Disabling DSI output\n"); > > > > > > if (dsi->panel) { > > > drm_panel_disable(dsi->panel); > > > drm_panel_unprepare(dsi->panel); > > > + } else if (dsi->next_bridge) { > > > + dsi->next_bridge->funcs->atomic_disable(dsi->next_bridge, old_bridge_state); > > > + dsi->next_bridge->funcs->atomic_post_disable(dsi->next_bridge, old_bridge_state); > > > > Ditto > > > > > } > > > > > > phy_power_off(dsi->dphy); > > > @@ -842,9 +854,25 @@ static const struct drm_connector_funcs sun6i_dsi_connector_funcs = { > > > .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > > > }; > > > > > > -static const struct drm_encoder_helper_funcs sun6i_dsi_enc_helper_funcs = { > > > - .disable = sun6i_dsi_encoder_disable, > > > - .enable = sun6i_dsi_encoder_enable, > > > +static int sun6i_dsi_bridge_attach(struct drm_bridge *bridge, > > > + enum drm_bridge_attach_flags flags) > > > +{ > > > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > > + > > > + if (dsi->next_bridge) > > > + return drm_bridge_attach(bridge->encoder, dsi->next_bridge, > > > + NULL, 0); > > > + > > > + return 0; > > > +} > > > + > > > +static const struct drm_bridge_funcs sun6i_dsi_bridge_funcs = { > > > + .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_enable = sun6i_dsi_bridge_atomic_enable, > > > + .atomic_disable = sun6i_dsi_bridge_atomic_disable, > > > + .attach = sun6i_dsi_bridge_attach, > > > }; > > > > > > static u32 sun6i_dsi_dcs_build_pkt_hdr(struct sun6i_dsi *dsi, > > > @@ -966,8 +994,6 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, > > > struct sun6i_dsi *dsi = dev_get_drvdata(dev); > > > int ret; > > > > > > - drm_encoder_helper_add(&dsi->encoder, > > > - &sun6i_dsi_enc_helper_funcs); > > > ret = drm_simple_encoder_init(drm, &dsi->encoder, > > > DRM_MODE_ENCODER_DSI); > > > if (ret) { > > > @@ -976,18 +1002,26 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, > > > } > > > dsi->encoder.possible_crtcs = BIT(0); > > > > > > - drm_connector_helper_add(&dsi->connector, > > > - &sun6i_dsi_connector_helper_funcs); > > > - ret = drm_connector_init(drm, &dsi->connector, > > > - &sun6i_dsi_connector_funcs, > > > - DRM_MODE_CONNECTOR_DSI); > > > + ret = drm_bridge_attach(&dsi->encoder, &dsi->bridge, NULL, 0); > > > if (ret) { > > > - dev_err(dsi->dev, > > > - "Couldn't initialise the DSI connector\n"); > > > + dev_err(dsi->dev, "Couldn't attach drm bridge\n"); > > > goto err_cleanup_connector; > > > } > > > > > > - drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); > > > + if (dsi->panel) { > > > + drm_connector_helper_add(&dsi->connector, > > > + &sun6i_dsi_connector_helper_funcs); > > > + ret = drm_connector_init(drm, &dsi->connector, > > > + &sun6i_dsi_connector_funcs, > > > + DRM_MODE_CONNECTOR_DSI); > > > + if (ret) { > > > + dev_err(dsi->dev, > > > + "Couldn't initialise the DSI connector\n"); > > > + goto err_cleanup_connector; > > > + } > > > + > > > + drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); > > > + } > > > > > > return 0; > > > > > > @@ -1013,16 +1047,46 @@ static int sun6i_dsi_attach(struct mipi_dsi_host *host, > > > struct mipi_dsi_device *device) > > > { > > > struct sun6i_dsi *dsi = host_to_sun6i_dsi(host); > > > - struct drm_panel *panel = of_drm_find_panel(device->dev.of_node); > > > + struct device_node *remote = device->dev.of_node; > > > int ret; > > > > > > - if (IS_ERR(panel)) > > > - return PTR_ERR(panel); > > > + if (!of_device_is_available(remote)) { > > > + /** > > > + * I2C interfaced DSI bridges will register DSI host on the > > > + * bridge drivers instead of conventional device. > > > + * > > > + * Those are probed via host of_node instead of device of_node. > > > + */ > > > > I have no idea what you mean here. Can you expand on what issue you've > > tried to solve here? > > I2C interface DSI bridges will register DSI host on the bridge > drivers. DSI bridges don't register a DSI host. > Those can be found using host->dev->of_node and cannot be find using > device->dev.of_node > > > > > > + remote = of_graph_get_remote_node(host->dev->of_node, 0, 0); > > > + if (!remote) > > > + return -ENODEV; > > > + } > > > + > > > + dsi->panel = of_drm_find_panel(remote); > > > + if (IS_ERR(dsi->panel)) { > > > + dsi->panel = NULL; > > > + > > > + dsi->next_bridge = of_drm_find_bridge(remote); > > > + if (IS_ERR(dsi->next_bridge)) { > > > + dev_err(dsi->dev, "failed to find bridge\n"); > > > + return PTR_ERR(dsi->next_bridge); > > > + } > > > + } else { > > > + dsi->next_bridge = NULL; > > > + } > > > + > > > + of_node_put(remote); > > > > Using devm_drm_of_get_bridge would greatly simplify the driver > > I'm aware of this and this would break the existing sunxi dsi binding, > we are not using ports based pipeline in dsi node. Of-course you have > pointed the same before, please check below > https://patchwork.kernel.org/project/dri-devel/patch/20210322140152.101709-2-jagan@amarulasolutions.com/ Then drm_of_find_panel_or_bridge needs to be adjusted to handle the DSI bindings and look for a panel or bridge not only through the OF graph, but also on the child nodes Maxime
Hi Maxime, On Mon, Nov 22, 2021 at 7:35 PM Maxime Ripard <maxime@cerno.tech> wrote: > > On Mon, Nov 22, 2021 at 07:18:13PM +0530, Jagan Teki wrote: > > Hi Maxime, > > > > On Mon, Nov 22, 2021 at 3:37 PM Maxime Ripard <maxime@cerno.tech> wrote: > > > > > > On Mon, Nov 22, 2021 at 12:22:19PM +0530, Jagan Teki wrote: > > > > Some display panels would come up with a non-DSI output, those > > > > can have an option to connect the DSI host by means of interface > > > > bridge converter. > > > > > > > > This DSI to non-DSI interface bridge converter would requires > > > > DSI Host to handle drm bridge functionalities in order to DSI > > > > Host to Interface bridge. > > > > > > In order to do this you would need to use the DRM bridge API... > > > > Sorry, which bridge API do you mean? > > Any variant of of_drm_find_bridge, and drm_bridge_attach. Just like > we're doing in sun4i_rgb.c Yes, we have drm_bridge_attach in bind and bridge_function.attach calls in this patch and of_drm_find_bridge in sun6i_mipi_dsi_attach. Not sure which API's I've missed. > > > > > This patch convert the existing to a drm bridge driver with a > > > > built-in encoder support for compatibility with existing > > > > component drivers. > > > > > > ... but changing the encoder driver to a bridge is completely > > > unnecessary to do so. Why did you need to make that change? > > > > Idea of this series is to convert the driver to bridge and use the > > latest bridge function from the v1 series. > > Ok, but it's not at all what you mention in your commit log? You don't > need any of that in order to support a bridge downstream. I've mentioned "Converting to bridge driver" and thought it has meaning of converting encoder related function to bridge functions as well. Not think about specific description to describe on commit message. Will update this. > > > > > > > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > > > > > > > > --- > > > > Changes for v5: > > > > - add atomic APIs > > > > - find host and device variant DSI devices. > > > > Changes for v4, v3: > > > > - none > > > > > > > > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 112 ++++++++++++++++++++----- > > > > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 7 ++ > > > > 2 files changed, 96 insertions(+), 23 deletions(-) > > > > > > > > diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > > > > index 43d9c9e5198d..a6a272b55f77 100644 > > > > --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > > > > +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > > > > @@ -21,6 +21,7 @@ > > > > > > > > #include <drm/drm_atomic_helper.h> > > > > #include <drm/drm_mipi_dsi.h> > > > > +#include <drm/drm_of.h> > > > > #include <drm/drm_panel.h> > > > > #include <drm/drm_print.h> > > > > #include <drm/drm_probe_helper.h> > > > > @@ -713,10 +714,11 @@ static int sun6i_dsi_start(struct sun6i_dsi *dsi, > > > > return 0; > > > > } > > > > > > > > -static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > > > +static void sun6i_dsi_bridge_atomic_enable(struct drm_bridge *bridge, > > > > + struct drm_bridge_state *old_bridge_state) > > > > { > > > > - struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; > > > > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > > > > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > > > + struct drm_display_mode *mode = &bridge->encoder->crtc->state->adjusted_mode; > > > > struct mipi_dsi_device *device = dsi->device; > > > > union phy_configure_opts opts = { }; > > > > struct phy_configure_opts_mipi_dphy *cfg = &opts.mipi_dphy; > > > > @@ -772,6 +774,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > > > if (dsi->panel) > > > > drm_panel_prepare(dsi->panel); > > > > > > > > + if (dsi->next_bridge) > > > > + dsi->next_bridge->funcs->atomic_pre_enable(dsi->next_bridge, old_bridge_state); > > > > + > > > > > > Please use the proper helpers. > > > > If we use bridge_functions we need to take atomic functions as > > precedence as the next bridge functions might convert atomic calls. > > We've had this discussion over and over again, but this is something > that needs to be documented and / or in your commit log. > > You must not deviate from the standard (and expected) behavior without > any kind of justification. Not exactly sure about what you mean, sorry. All these atomic bridge functions are already documented if I'm not wrong and Laurent have patches to switch the normal functions to atomic. Not sure what else need to document here and need justification for it if the driver is converting to bridge. > > > > > > > > /* > > > > * FIXME: This should be moved after the switch to HS mode. > > > > * > > > > @@ -787,6 +792,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > > > if (dsi->panel) > > > > drm_panel_enable(dsi->panel); > > > > > > > > + if (dsi->next_bridge) > > > > + dsi->next_bridge->funcs->atomic_enable(dsi->next_bridge, old_bridge_state); > > > > + > > > > > > Ditto > > > > > > > sun6i_dsi_start(dsi, DSI_START_HSC); > > > > > > > > udelay(1000); > > > > @@ -794,15 +802,19 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > > > sun6i_dsi_start(dsi, DSI_START_HSD); > > > > } > > > > > > > > -static void sun6i_dsi_encoder_disable(struct drm_encoder *encoder) > > > > +static void sun6i_dsi_bridge_atomic_disable(struct drm_bridge *bridge, > > > > + struct drm_bridge_state *old_bridge_state) > > > > { > > > > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > > > > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > > > > > > > DRM_DEBUG_DRIVER("Disabling DSI output\n"); > > > > > > > > if (dsi->panel) { > > > > drm_panel_disable(dsi->panel); > > > > drm_panel_unprepare(dsi->panel); > > > > + } else if (dsi->next_bridge) { > > > > + dsi->next_bridge->funcs->atomic_disable(dsi->next_bridge, old_bridge_state); > > > > + dsi->next_bridge->funcs->atomic_post_disable(dsi->next_bridge, old_bridge_state); > > > > > > Ditto > > > > > > > } > > > > > > > > phy_power_off(dsi->dphy); > > > > @@ -842,9 +854,25 @@ static const struct drm_connector_funcs sun6i_dsi_connector_funcs = { > > > > .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > > > > }; > > > > > > > > -static const struct drm_encoder_helper_funcs sun6i_dsi_enc_helper_funcs = { > > > > - .disable = sun6i_dsi_encoder_disable, > > > > - .enable = sun6i_dsi_encoder_enable, > > > > +static int sun6i_dsi_bridge_attach(struct drm_bridge *bridge, > > > > + enum drm_bridge_attach_flags flags) > > > > +{ > > > > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > > > + > > > > + if (dsi->next_bridge) > > > > + return drm_bridge_attach(bridge->encoder, dsi->next_bridge, > > > > + NULL, 0); > > > > + > > > > + return 0; > > > > +} > > > > + > > > > +static const struct drm_bridge_funcs sun6i_dsi_bridge_funcs = { > > > > + .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_enable = sun6i_dsi_bridge_atomic_enable, > > > > + .atomic_disable = sun6i_dsi_bridge_atomic_disable, > > > > + .attach = sun6i_dsi_bridge_attach, > > > > }; > > > > > > > > static u32 sun6i_dsi_dcs_build_pkt_hdr(struct sun6i_dsi *dsi, > > > > @@ -966,8 +994,6 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, > > > > struct sun6i_dsi *dsi = dev_get_drvdata(dev); > > > > int ret; > > > > > > > > - drm_encoder_helper_add(&dsi->encoder, > > > > - &sun6i_dsi_enc_helper_funcs); > > > > ret = drm_simple_encoder_init(drm, &dsi->encoder, > > > > DRM_MODE_ENCODER_DSI); > > > > if (ret) { > > > > @@ -976,18 +1002,26 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, > > > > } > > > > dsi->encoder.possible_crtcs = BIT(0); > > > > > > > > - drm_connector_helper_add(&dsi->connector, > > > > - &sun6i_dsi_connector_helper_funcs); > > > > - ret = drm_connector_init(drm, &dsi->connector, > > > > - &sun6i_dsi_connector_funcs, > > > > - DRM_MODE_CONNECTOR_DSI); > > > > + ret = drm_bridge_attach(&dsi->encoder, &dsi->bridge, NULL, 0); > > > > if (ret) { > > > > - dev_err(dsi->dev, > > > > - "Couldn't initialise the DSI connector\n"); > > > > + dev_err(dsi->dev, "Couldn't attach drm bridge\n"); > > > > goto err_cleanup_connector; > > > > } > > > > > > > > - drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); > > > > + if (dsi->panel) { > > > > + drm_connector_helper_add(&dsi->connector, > > > > + &sun6i_dsi_connector_helper_funcs); > > > > + ret = drm_connector_init(drm, &dsi->connector, > > > > + &sun6i_dsi_connector_funcs, > > > > + DRM_MODE_CONNECTOR_DSI); > > > > + if (ret) { > > > > + dev_err(dsi->dev, > > > > + "Couldn't initialise the DSI connector\n"); > > > > + goto err_cleanup_connector; > > > > + } > > > > + > > > > + drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); > > > > + } > > > > > > > > return 0; > > > > > > > > @@ -1013,16 +1047,46 @@ static int sun6i_dsi_attach(struct mipi_dsi_host *host, > > > > struct mipi_dsi_device *device) > > > > { > > > > struct sun6i_dsi *dsi = host_to_sun6i_dsi(host); > > > > - struct drm_panel *panel = of_drm_find_panel(device->dev.of_node); > > > > + struct device_node *remote = device->dev.of_node; > > > > int ret; > > > > > > > > - if (IS_ERR(panel)) > > > > - return PTR_ERR(panel); > > > > + if (!of_device_is_available(remote)) { > > > > + /** > > > > + * I2C interfaced DSI bridges will register DSI host on the > > > > + * bridge drivers instead of conventional device. > > > > + * > > > > + * Those are probed via host of_node instead of device of_node. > > > > + */ > > > > > > I have no idea what you mean here. Can you expand on what issue you've > > > tried to solve here? > > > > I2C interface DSI bridges will register DSI host on the bridge > > drivers. > > DSI bridges don't register a DSI host. Please check what I mean here, https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/drivers/gpu/drm/bridge/ti-sn65dsi83.c#n623 I've tested it anyway, if you have any relevant one please check as well. > > > Those can be found using host->dev->of_node and cannot be find using > > device->dev.of_node > > > > > > > > > + remote = of_graph_get_remote_node(host->dev->of_node, 0, 0); > > > > + if (!remote) > > > > + return -ENODEV; > > > > + } > > > > + > > > > + dsi->panel = of_drm_find_panel(remote); > > > > + if (IS_ERR(dsi->panel)) { > > > > + dsi->panel = NULL; > > > > + > > > > + dsi->next_bridge = of_drm_find_bridge(remote); > > > > + if (IS_ERR(dsi->next_bridge)) { > > > > + dev_err(dsi->dev, "failed to find bridge\n"); > > > > + return PTR_ERR(dsi->next_bridge); > > > > + } > > > > + } else { > > > > + dsi->next_bridge = NULL; > > > > + } > > > > + > > > > + of_node_put(remote); > > > > > > Using devm_drm_of_get_bridge would greatly simplify the driver > > > > I'm aware of this and this would break the existing sunxi dsi binding, > > we are not using ports based pipeline in dsi node. Of-course you have > > pointed the same before, please check below > > https://patchwork.kernel.org/project/dri-devel/patch/20210322140152.101709-2-jagan@amarulasolutions.com/ > > Then drm_of_find_panel_or_bridge needs to be adjusted to handle the DSI > bindings and look for a panel or bridge not only through the OF graph, > but also on the child nodes Okay. I need to check this. Thanks, Jagan.
On Mon, Nov 22, 2021 at 07:49:26PM +0530, Jagan Teki wrote: > On Mon, Nov 22, 2021 at 7:35 PM Maxime Ripard <maxime@cerno.tech> wrote: > > On Mon, Nov 22, 2021 at 07:18:13PM +0530, Jagan Teki wrote: > > > On Mon, Nov 22, 2021 at 3:37 PM Maxime Ripard <maxime@cerno.tech> wrote: > > > > > > > > On Mon, Nov 22, 2021 at 12:22:19PM +0530, Jagan Teki wrote: > > > > > Some display panels would come up with a non-DSI output, those > > > > > can have an option to connect the DSI host by means of interface > > > > > bridge converter. > > > > > > > > > > This DSI to non-DSI interface bridge converter would requires > > > > > DSI Host to handle drm bridge functionalities in order to DSI > > > > > Host to Interface bridge. > > > > > > > > In order to do this you would need to use the DRM bridge API... > > > > > > Sorry, which bridge API do you mean? > > > > Any variant of of_drm_find_bridge, and drm_bridge_attach. Just like > > we're doing in sun4i_rgb.c > > Yes, we have drm_bridge_attach in bind and bridge_function.attach > calls in this patch and of_drm_find_bridge in sun6i_mipi_dsi_attach. > Not sure which API's I've missed. None, that's my point, you don't need anything else in order to do what you wanted to achieve. > > > > > > > This patch convert the existing to a drm bridge driver with a > > > > > built-in encoder support for compatibility with existing > > > > > component drivers. > > > > > > > > ... but changing the encoder driver to a bridge is completely > > > > unnecessary to do so. Why did you need to make that change? > > > > > > Idea of this series is to convert the driver to bridge and use the > > > latest bridge function from the v1 series. > > > > Ok, but it's not at all what you mention in your commit log? You don't > > need any of that in order to support a bridge downstream. > > I've mentioned "Converting to bridge driver" and thought it has > meaning of converting encoder related function to bridge functions as > well. Not think about specific description to describe on commit > message. Will update this. But you provided no reason to do so. The only one you did mention was that you wanted to support downstream bridges, but you don't need to convert the DSI driver to a bridge in order to do that. > > > > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > > > > > > > > > > --- > > > > > Changes for v5: > > > > > - add atomic APIs > > > > > - find host and device variant DSI devices. > > > > > Changes for v4, v3: > > > > > - none > > > > > > > > > > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 112 ++++++++++++++++++++----- > > > > > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 7 ++ > > > > > 2 files changed, 96 insertions(+), 23 deletions(-) > > > > > > > > > > diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > > > > > index 43d9c9e5198d..a6a272b55f77 100644 > > > > > --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > > > > > +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > > > > > @@ -21,6 +21,7 @@ > > > > > > > > > > #include <drm/drm_atomic_helper.h> > > > > > #include <drm/drm_mipi_dsi.h> > > > > > +#include <drm/drm_of.h> > > > > > #include <drm/drm_panel.h> > > > > > #include <drm/drm_print.h> > > > > > #include <drm/drm_probe_helper.h> > > > > > @@ -713,10 +714,11 @@ static int sun6i_dsi_start(struct sun6i_dsi *dsi, > > > > > return 0; > > > > > } > > > > > > > > > > -static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > > > > +static void sun6i_dsi_bridge_atomic_enable(struct drm_bridge *bridge, > > > > > + struct drm_bridge_state *old_bridge_state) > > > > > { > > > > > - struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; > > > > > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > > > > > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > > > > + struct drm_display_mode *mode = &bridge->encoder->crtc->state->adjusted_mode; > > > > > struct mipi_dsi_device *device = dsi->device; > > > > > union phy_configure_opts opts = { }; > > > > > struct phy_configure_opts_mipi_dphy *cfg = &opts.mipi_dphy; > > > > > @@ -772,6 +774,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > > > > if (dsi->panel) > > > > > drm_panel_prepare(dsi->panel); > > > > > > > > > > + if (dsi->next_bridge) > > > > > + dsi->next_bridge->funcs->atomic_pre_enable(dsi->next_bridge, old_bridge_state); > > > > > + > > > > > > > > Please use the proper helpers. > > > > > > If we use bridge_functions we need to take atomic functions as > > > precedence as the next bridge functions might convert atomic calls. > > > > We've had this discussion over and over again, but this is something > > that needs to be documented and / or in your commit log. > > > > You must not deviate from the standard (and expected) behavior without > > any kind of justification. > > Not exactly sure about what you mean, sorry. All these atomic bridge > functions are already documented if I'm not wrong and Laurent have > patches to switch the normal functions to atomic. Not sure what else > need to document here and need justification for it if the driver is > converting to bridge. There's two separate bridge in that discussion: the DSI controller itself that you convert to a bridge, and the downstream DSI -> whatever bridge. The atomic functions in the "DSI controller bridge" are fine. But that comment was about calling the downstream bridge ops directly from the driver, which is something that no other driver is doing, deviates from the expectations, and you didn't provide any explanation for that. > > > > > > > > > > > /* > > > > > * FIXME: This should be moved after the switch to HS mode. > > > > > * > > > > > @@ -787,6 +792,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > > > > if (dsi->panel) > > > > > drm_panel_enable(dsi->panel); > > > > > > > > > > + if (dsi->next_bridge) > > > > > + dsi->next_bridge->funcs->atomic_enable(dsi->next_bridge, old_bridge_state); > > > > > + > > > > > > > > Ditto > > > > > > > > > sun6i_dsi_start(dsi, DSI_START_HSC); > > > > > > > > > > udelay(1000); > > > > > @@ -794,15 +802,19 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > > > > sun6i_dsi_start(dsi, DSI_START_HSD); > > > > > } > > > > > > > > > > -static void sun6i_dsi_encoder_disable(struct drm_encoder *encoder) > > > > > +static void sun6i_dsi_bridge_atomic_disable(struct drm_bridge *bridge, > > > > > + struct drm_bridge_state *old_bridge_state) > > > > > { > > > > > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > > > > > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > > > > > > > > > DRM_DEBUG_DRIVER("Disabling DSI output\n"); > > > > > > > > > > if (dsi->panel) { > > > > > drm_panel_disable(dsi->panel); > > > > > drm_panel_unprepare(dsi->panel); > > > > > + } else if (dsi->next_bridge) { > > > > > + dsi->next_bridge->funcs->atomic_disable(dsi->next_bridge, old_bridge_state); > > > > > + dsi->next_bridge->funcs->atomic_post_disable(dsi->next_bridge, old_bridge_state); > > > > > > > > Ditto > > > > > > > > > } > > > > > > > > > > phy_power_off(dsi->dphy); > > > > > @@ -842,9 +854,25 @@ static const struct drm_connector_funcs sun6i_dsi_connector_funcs = { > > > > > .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > > > > > }; > > > > > > > > > > -static const struct drm_encoder_helper_funcs sun6i_dsi_enc_helper_funcs = { > > > > > - .disable = sun6i_dsi_encoder_disable, > > > > > - .enable = sun6i_dsi_encoder_enable, > > > > > +static int sun6i_dsi_bridge_attach(struct drm_bridge *bridge, > > > > > + enum drm_bridge_attach_flags flags) > > > > > +{ > > > > > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > > > > + > > > > > + if (dsi->next_bridge) > > > > > + return drm_bridge_attach(bridge->encoder, dsi->next_bridge, > > > > > + NULL, 0); > > > > > + > > > > > + return 0; > > > > > +} > > > > > + > > > > > +static const struct drm_bridge_funcs sun6i_dsi_bridge_funcs = { > > > > > + .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_enable = sun6i_dsi_bridge_atomic_enable, > > > > > + .atomic_disable = sun6i_dsi_bridge_atomic_disable, > > > > > + .attach = sun6i_dsi_bridge_attach, > > > > > }; > > > > > > > > > > static u32 sun6i_dsi_dcs_build_pkt_hdr(struct sun6i_dsi *dsi, > > > > > @@ -966,8 +994,6 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, > > > > > struct sun6i_dsi *dsi = dev_get_drvdata(dev); > > > > > int ret; > > > > > > > > > > - drm_encoder_helper_add(&dsi->encoder, > > > > > - &sun6i_dsi_enc_helper_funcs); > > > > > ret = drm_simple_encoder_init(drm, &dsi->encoder, > > > > > DRM_MODE_ENCODER_DSI); > > > > > if (ret) { > > > > > @@ -976,18 +1002,26 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, > > > > > } > > > > > dsi->encoder.possible_crtcs = BIT(0); > > > > > > > > > > - drm_connector_helper_add(&dsi->connector, > > > > > - &sun6i_dsi_connector_helper_funcs); > > > > > - ret = drm_connector_init(drm, &dsi->connector, > > > > > - &sun6i_dsi_connector_funcs, > > > > > - DRM_MODE_CONNECTOR_DSI); > > > > > + ret = drm_bridge_attach(&dsi->encoder, &dsi->bridge, NULL, 0); > > > > > if (ret) { > > > > > - dev_err(dsi->dev, > > > > > - "Couldn't initialise the DSI connector\n"); > > > > > + dev_err(dsi->dev, "Couldn't attach drm bridge\n"); > > > > > goto err_cleanup_connector; > > > > > } > > > > > > > > > > - drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); > > > > > + if (dsi->panel) { > > > > > + drm_connector_helper_add(&dsi->connector, > > > > > + &sun6i_dsi_connector_helper_funcs); > > > > > + ret = drm_connector_init(drm, &dsi->connector, > > > > > + &sun6i_dsi_connector_funcs, > > > > > + DRM_MODE_CONNECTOR_DSI); > > > > > + if (ret) { > > > > > + dev_err(dsi->dev, > > > > > + "Couldn't initialise the DSI connector\n"); > > > > > + goto err_cleanup_connector; > > > > > + } > > > > > + > > > > > + drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); > > > > > + } > > > > > > > > > > return 0; > > > > > > > > > > @@ -1013,16 +1047,46 @@ static int sun6i_dsi_attach(struct mipi_dsi_host *host, > > > > > struct mipi_dsi_device *device) > > > > > { > > > > > struct sun6i_dsi *dsi = host_to_sun6i_dsi(host); > > > > > - struct drm_panel *panel = of_drm_find_panel(device->dev.of_node); > > > > > + struct device_node *remote = device->dev.of_node; > > > > > int ret; > > > > > > > > > > - if (IS_ERR(panel)) > > > > > - return PTR_ERR(panel); > > > > > + if (!of_device_is_available(remote)) { > > > > > + /** > > > > > + * I2C interfaced DSI bridges will register DSI host on the > > > > > + * bridge drivers instead of conventional device. > > > > > + * > > > > > + * Those are probed via host of_node instead of device of_node. > > > > > + */ > > > > > > > > I have no idea what you mean here. Can you expand on what issue you've > > > > tried to solve here? > > > > > > I2C interface DSI bridges will register DSI host on the bridge > > > drivers. > > > > DSI bridges don't register a DSI host. > > Please check what I mean here, > https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/drivers/gpu/drm/bridge/ti-sn65dsi83.c#n623 > > I've tested it anyway, if you have any relevant one please check as well. That driver doesn't register a DSI Host though? It registers a DSI device Maxime
Hi, On 22/11/2021 14:16, Jagan Teki wrote: > Hi Neil, > > On Mon, Nov 22, 2021 at 6:22 PM Neil Armstrong <narmstrong@baylibre.com> wrote: >> >> On 22/11/2021 07:52, Jagan Teki wrote: >>> Some display panels would come up with a non-DSI output, those >>> can have an option to connect the DSI host by means of interface >>> bridge converter. >>> >>> This DSI to non-DSI interface bridge converter would requires >>> DSI Host to handle drm bridge functionalities in order to DSI >>> Host to Interface bridge. >>> >>> This patch convert the existing to a drm bridge driver with a >>> built-in encoder support for compatibility with existing >>> component drivers. >>> >>> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> >>> --- >>> Changes for v5: >>> - add atomic APIs >>> - find host and device variant DSI devices. >>> Changes for v4, v3: >>> - none >>> >>> drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 112 ++++++++++++++++++++----- >>> drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 7 ++ >>> 2 files changed, 96 insertions(+), 23 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c >>> index 43d9c9e5198d..a6a272b55f77 100644 >>> --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c >>> +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c >>> @@ -21,6 +21,7 @@ >>> >>> #include <drm/drm_atomic_helper.h> >>> #include <drm/drm_mipi_dsi.h> >>> +#include <drm/drm_of.h> >>> #include <drm/drm_panel.h> >>> #include <drm/drm_print.h> >>> #include <drm/drm_probe_helper.h> >>> @@ -713,10 +714,11 @@ static int sun6i_dsi_start(struct sun6i_dsi *dsi, >>> return 0; >>> } >>> >>> -static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) >>> +static void sun6i_dsi_bridge_atomic_enable(struct drm_bridge *bridge, >>> + struct drm_bridge_state *old_bridge_state) >>> { >>> - struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; >>> - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); >>> + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); >>> + struct drm_display_mode *mode = &bridge->encoder->crtc->state->adjusted_mode; >>> struct mipi_dsi_device *device = dsi->device; >>> union phy_configure_opts opts = { }; >>> struct phy_configure_opts_mipi_dphy *cfg = &opts.mipi_dphy; >>> @@ -772,6 +774,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) >>> if (dsi->panel) >>> drm_panel_prepare(dsi->panel); >>> >>> + if (dsi->next_bridge) >>> + dsi->next_bridge->funcs->atomic_pre_enable(dsi->next_bridge, old_bridge_state); >>> + >>> /* >>> * FIXME: This should be moved after the switch to HS mode. >>> * >>> @@ -787,6 +792,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) >>> if (dsi->panel) >>> drm_panel_enable(dsi->panel); >>> >>> + if (dsi->next_bridge) >>> + dsi->next_bridge->funcs->atomic_enable(dsi->next_bridge, old_bridge_state); >>> + >> >> >> No need to call the next bridge atomic pre_enable/enable/disable/post_disable since they will >> be called automatically on the bridge chain. > > Correct, but the existing bridge chain (stack) is not compatible with > sun6i DSI start sequence. We cannot send any DCS once we start HS > mode. > https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c#n775 It's a classical DSI sequence init issue, look at dw-mipi-dsi: https://github.com/torvalds/linux/blob/master/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c We setup the "command-mode" (low-speed) withing mode_set so when the next bridge dsi_pre_enable is called, low-speed DCS can be sent, then the bridge enable() sets video mode (high-speed). The disable still needs to call the next_bridge post_disable : https://elixir.bootlin.com/linux/v5.16-rc2/source/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c#L893 You can send any low-speed DCS once HS mode is started if the HW supports it and the driver handles it, look at the https://elixir.bootlin.com/linux/v5.16-rc2/source/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c#L397 The MIPI_DSI_MODE_LPM and MIPI_DSI_MSG_USE_LPM is used for that. Neil > > This specific problem can be fixed only if we change the bridge chain > from stack to queue. Please check this series > https://patchwork.kernel.org/project/dri-devel/patch/20210214194102.126146-6-jagan@amarulasolutions.com/ > > Jagan. >
Hi On Mon, 22 Nov 2021 at 15:35, Neil Armstrong <narmstrong@baylibre.com> wrote: > > Hi, > > On 22/11/2021 14:16, Jagan Teki wrote: > > Hi Neil, > > > > On Mon, Nov 22, 2021 at 6:22 PM Neil Armstrong <narmstrong@baylibre.com> wrote: > >> > >> On 22/11/2021 07:52, Jagan Teki wrote: > >>> Some display panels would come up with a non-DSI output, those > >>> can have an option to connect the DSI host by means of interface > >>> bridge converter. > >>> > >>> This DSI to non-DSI interface bridge converter would requires > >>> DSI Host to handle drm bridge functionalities in order to DSI > >>> Host to Interface bridge. > >>> > >>> This patch convert the existing to a drm bridge driver with a > >>> built-in encoder support for compatibility with existing > >>> component drivers. > >>> > >>> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > >>> --- > >>> Changes for v5: > >>> - add atomic APIs > >>> - find host and device variant DSI devices. > >>> Changes for v4, v3: > >>> - none > >>> > >>> drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 112 ++++++++++++++++++++----- > >>> drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 7 ++ > >>> 2 files changed, 96 insertions(+), 23 deletions(-) > >>> > >>> diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > >>> index 43d9c9e5198d..a6a272b55f77 100644 > >>> --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > >>> +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > >>> @@ -21,6 +21,7 @@ > >>> > >>> #include <drm/drm_atomic_helper.h> > >>> #include <drm/drm_mipi_dsi.h> > >>> +#include <drm/drm_of.h> > >>> #include <drm/drm_panel.h> > >>> #include <drm/drm_print.h> > >>> #include <drm/drm_probe_helper.h> > >>> @@ -713,10 +714,11 @@ static int sun6i_dsi_start(struct sun6i_dsi *dsi, > >>> return 0; > >>> } > >>> > >>> -static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > >>> +static void sun6i_dsi_bridge_atomic_enable(struct drm_bridge *bridge, > >>> + struct drm_bridge_state *old_bridge_state) > >>> { > >>> - struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; > >>> - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > >>> + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > >>> + struct drm_display_mode *mode = &bridge->encoder->crtc->state->adjusted_mode; > >>> struct mipi_dsi_device *device = dsi->device; > >>> union phy_configure_opts opts = { }; > >>> struct phy_configure_opts_mipi_dphy *cfg = &opts.mipi_dphy; > >>> @@ -772,6 +774,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > >>> if (dsi->panel) > >>> drm_panel_prepare(dsi->panel); > >>> > >>> + if (dsi->next_bridge) > >>> + dsi->next_bridge->funcs->atomic_pre_enable(dsi->next_bridge, old_bridge_state); > >>> + > >>> /* > >>> * FIXME: This should be moved after the switch to HS mode. > >>> * > >>> @@ -787,6 +792,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > >>> if (dsi->panel) > >>> drm_panel_enable(dsi->panel); > >>> > >>> + if (dsi->next_bridge) > >>> + dsi->next_bridge->funcs->atomic_enable(dsi->next_bridge, old_bridge_state); > >>> + > >> > >> > >> No need to call the next bridge atomic pre_enable/enable/disable/post_disable since they will > >> be called automatically on the bridge chain. > > > > Correct, but the existing bridge chain (stack) is not compatible with > > sun6i DSI start sequence. We cannot send any DCS once we start HS > > mode. > > https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c#n775 > > It's a classical DSI sequence init issue, look at dw-mipi-dsi: > https://github.com/torvalds/linux/blob/master/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c > > We setup the "command-mode" (low-speed) withing mode_set so when the next bridge dsi_pre_enable is called, > low-speed DCS can be sent, then the bridge enable() sets video mode (high-speed). > The disable still needs to call the next_bridge post_disable : > https://elixir.bootlin.com/linux/v5.16-rc2/source/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c#L893 Doesn't that mean the post_disable gets called twice? Once by the dw-mipi-dsi driver and once by the framework. > You can send any low-speed DCS once HS mode is started if the HW supports it and the driver handles it, look > at the https://elixir.bootlin.com/linux/v5.16-rc2/source/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c#L397 > The MIPI_DSI_MODE_LPM and MIPI_DSI_MSG_USE_LPM is used for that. This seems to be the same question as I was asking back in [1] and continued in [2]. vc4 and Exynos break the chain apart so that they can initialise the DSI host before the panel. That doesn't work if the DSI host is an encoder, as the encoder mode_valid call is missing the struct drm_display_info needed for calling the bridge mode_valid function. It also fails with the atomic operations as the framework can't see the bridges/panels beyond the DSI host, and therefore doesn't create the state for them. This is why I've been trying to reinstate the chain as a whole for vc4, however we then hit the issue of the downstream bridge/panel pre_enables being called before the DSI host (be it a bridge or encoder), therefore it's unlikely to have been powered up or configured. The DSI bus is also generally going to be powered down during the pre_enables, when many displays want it at LP-11. It sounds like dw-mipi-dsi has a hack to the bridge operations and powers up in mode_set (not what the docs say). sun6i sounds to have some similar restrictions that these patches are trying to work around. The documentation for struct mipi_dsi_host_ops transfer [3] states: * Also note that those callbacks can be called no matter the state the * host is in. Drivers that need the underlying device to be powered to * perform these operations will first need to make sure it's been * properly enabled. It sounds like neither of the above drivers do this. As stated it would be valid to request a transfer from attach, at which point mode_set hasn't been called, so dw-mipi-dsi falls down there. sun4i can't send commands once in HS mode. What's the correct behaviour if the hardware can't support sending the transfer due to the state? Returning an error would be an obvious step. Is it time to actually thrash out the specifics of how DSI should be implemented, and fix the DSI framework where it doesn't currently work? Previously proposed have been: - a pre_pre_enable (called from encoder outwards) and a matching post_post_disable (towards the encoder). - a mechanism for the panel/bridge to request that the PHY is powered up, so the bus is at LP-11, and the clock lane running if !MIPI_DSI_CLOCK_NON_CONTINUOUS, before powering up the bridge. (Powering up for transfers would be internal to the DSI host driver). Do either or both of those solve the problem in this case? The first is the easiest to implement, but does it cover all the current use cases? I don't quite see why dw-mipi-dsi calls the downstream post_disable early. Are there really devices that want to send DSI DCS transfers during shutdown? I'm guessing that's the reasoning, same as the power up via mode_set. There are already bridge drivers such as SN65DSI83 which don't follow the requirements specified in the datasheet for power up sequences due to issues in the framework. Hacking the bridge seems wrong. (It configures the bridge from enable because it needs the DSI clock lane running and LP-11 on the data lanes, but actually enable has the data lanes active too. It should be in pre_enable, but the clock lane isn't running then.) Also undefined in DRM is how DSI burst mode parameters should be configured, and the exact meaning of half the MIPI_DSI_MODE_* defines and their interactions (eg MIPI_DSI_VIDEO_MODE_BURST, but not MIPI_DSI_VIDEO [4]?). Cheers Dave [1] https://lists.freedesktop.org/archives/dri-devel/2021-July/313576.html [2] https://lists.freedesktop.org/archives/dri-devel/2021-October/325853.html [3] https://elixir.bootlin.com/linux/latest/source/include/drm/drm_mipi_dsi.h#L84 [4] https://elixir.bootlin.com/linux/latest/source/drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c#L226 > > > > This specific problem can be fixed only if we change the bridge chain > > from stack to queue. Please check this series > > https://patchwork.kernel.org/project/dri-devel/patch/20210214194102.126146-6-jagan@amarulasolutions.com/ > > > > Jagan. > > >
Hi Dave, On 22/11/2021 18:19, Dave Stevenson wrote: > Hi > > On Mon, 22 Nov 2021 at 15:35, Neil Armstrong <narmstrong@baylibre.com> wrote: >> >> Hi, >> >> On 22/11/2021 14:16, Jagan Teki wrote: >>> Hi Neil, >>> >>> On Mon, Nov 22, 2021 at 6:22 PM Neil Armstrong <narmstrong@baylibre.com> wrote: >>>> >>>> On 22/11/2021 07:52, Jagan Teki wrote: >>>>> Some display panels would come up with a non-DSI output, those >>>>> can have an option to connect the DSI host by means of interface >>>>> bridge converter. >>>>> >>>>> This DSI to non-DSI interface bridge converter would requires >>>>> DSI Host to handle drm bridge functionalities in order to DSI >>>>> Host to Interface bridge. >>>>> >>>>> This patch convert the existing to a drm bridge driver with a >>>>> built-in encoder support for compatibility with existing >>>>> component drivers. >>>>> >>>>> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> >>>>> --- >>>>> Changes for v5: >>>>> - add atomic APIs >>>>> - find host and device variant DSI devices. >>>>> Changes for v4, v3: >>>>> - none >>>>> >>>>> drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 112 ++++++++++++++++++++----- >>>>> drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 7 ++ >>>>> 2 files changed, 96 insertions(+), 23 deletions(-) >>>>> >>>>> diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c >>>>> index 43d9c9e5198d..a6a272b55f77 100644 >>>>> --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c >>>>> +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c >>>>> @@ -21,6 +21,7 @@ >>>>> >>>>> #include <drm/drm_atomic_helper.h> >>>>> #include <drm/drm_mipi_dsi.h> >>>>> +#include <drm/drm_of.h> >>>>> #include <drm/drm_panel.h> >>>>> #include <drm/drm_print.h> >>>>> #include <drm/drm_probe_helper.h> >>>>> @@ -713,10 +714,11 @@ static int sun6i_dsi_start(struct sun6i_dsi *dsi, >>>>> return 0; >>>>> } >>>>> >>>>> -static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) >>>>> +static void sun6i_dsi_bridge_atomic_enable(struct drm_bridge *bridge, >>>>> + struct drm_bridge_state *old_bridge_state) >>>>> { >>>>> - struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; >>>>> - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); >>>>> + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); >>>>> + struct drm_display_mode *mode = &bridge->encoder->crtc->state->adjusted_mode; >>>>> struct mipi_dsi_device *device = dsi->device; >>>>> union phy_configure_opts opts = { }; >>>>> struct phy_configure_opts_mipi_dphy *cfg = &opts.mipi_dphy; >>>>> @@ -772,6 +774,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) >>>>> if (dsi->panel) >>>>> drm_panel_prepare(dsi->panel); >>>>> >>>>> + if (dsi->next_bridge) >>>>> + dsi->next_bridge->funcs->atomic_pre_enable(dsi->next_bridge, old_bridge_state); >>>>> + >>>>> /* >>>>> * FIXME: This should be moved after the switch to HS mode. >>>>> * >>>>> @@ -787,6 +792,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) >>>>> if (dsi->panel) >>>>> drm_panel_enable(dsi->panel); >>>>> >>>>> + if (dsi->next_bridge) >>>>> + dsi->next_bridge->funcs->atomic_enable(dsi->next_bridge, old_bridge_state); >>>>> + >>>> >>>> >>>> No need to call the next bridge atomic pre_enable/enable/disable/post_disable since they will >>>> be called automatically on the bridge chain. >>> >>> Correct, but the existing bridge chain (stack) is not compatible with >>> sun6i DSI start sequence. We cannot send any DCS once we start HS >>> mode. >>> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c#n775 >> >> It's a classical DSI sequence init issue, look at dw-mipi-dsi: >> https://github.com/torvalds/linux/blob/master/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c >> >> We setup the "command-mode" (low-speed) withing mode_set so when the next bridge dsi_pre_enable is called, >> low-speed DCS can be sent, then the bridge enable() sets video mode (high-speed). >> The disable still needs to call the next_bridge post_disable : >> https://elixir.bootlin.com/linux/v5.16-rc2/source/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c#L893 > > Doesn't that mean the post_disable gets called twice? Once by the > dw-mipi-dsi driver and once by the framework. Yes indeed > >> You can send any low-speed DCS once HS mode is started if the HW supports it and the driver handles it, look >> at the https://elixir.bootlin.com/linux/v5.16-rc2/source/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c#L397 >> The MIPI_DSI_MODE_LPM and MIPI_DSI_MSG_USE_LPM is used for that. > > This seems to be the same question as I was asking back in [1] and > continued in [2]. > > vc4 and Exynos break the chain apart so that they can initialise the > DSI host before the panel. > That doesn't work if the DSI host is an encoder, as the encoder > mode_valid call is missing the struct drm_display_info needed for > calling the bridge mode_valid function. > It also fails with the atomic operations as the framework can't see > the bridges/panels beyond the DSI host, and therefore doesn't create > the state for them. > This is why I've been trying to reinstate the chain as a whole for > vc4, however we then hit the issue of the downstream bridge/panel > pre_enables being called before the DSI host (be it a bridge or > encoder), therefore it's unlikely to have been powered up or > configured. The DSI bus is also generally going to be powered down > during the pre_enables, when many displays want it at LP-11. > > It sounds like dw-mipi-dsi has a hack to the bridge operations and > powers up in mode_set (not what the docs say). sun6i sounds to have > some similar restrictions that these patches are trying to work > around. > > The documentation for struct mipi_dsi_host_ops transfer [3] states: > * Also note that those callbacks can be called no matter the state the > * host is in. Drivers that need the underlying device to be powered to > * perform these operations will first need to make sure it's been > * properly enabled. > > It sounds like neither of the above drivers do this. > As stated it would be valid to request a transfer from attach, at > which point mode_set hasn't been called, so dw-mipi-dsi falls down > there. sun4i can't send commands once in HS mode. > What's the correct behaviour if the hardware can't support sending the > transfer due to the state? Returning an error would be an obvious > step. > > > Is it time to actually thrash out the specifics of how DSI should be > implemented, and fix the DSI framework where it doesn't currently > work? Yes, we should fix this > > Previously proposed have been: > - a pre_pre_enable (called from encoder outwards) and a matching > post_post_disable (towards the encoder). > - a mechanism for the panel/bridge to request that the PHY is powered > up, so the bus is at LP-11, and the clock lane running if > !MIPI_DSI_CLOCK_NON_CONTINUOUS, before powering up the bridge. > (Powering up for transfers would be internal to the DSI host driver). > > Do either or both of those solve the problem in this case? The first > is the easiest to implement, but does it cover all the current use > cases? I don't think it's a viable solution, because maybe some weird protocol will need another pre_pre_pre_enable callback... I don't have the solution in mind but it must be generic and simple, smarter minds than mine should be able to think of it.... Maybe something like the format negotiation ? where each bridge can tell if they need precedence on the next bridge for a particular callback ? > I don't quite see why dw-mipi-dsi calls the downstream post_disable > early. Are there really devices that want to send DSI DCS transfers > during shutdown? I'm guessing that's the reasoning, same as the power > up via mode_set. Yes panels needs some DCS commands to correctly shut down the panel > > There are already bridge drivers such as SN65DSI83 which don't follow > the requirements specified in the datasheet for power up sequences due > to issues in the framework. Hacking the bridge seems wrong. > (It configures the bridge from enable because it needs the DSI clock > lane running and LP-11 on the data lanes, but actually enable has the > data lanes active too. It should be in pre_enable, but the clock lane > isn't running then.) > > Also undefined in DRM is how DSI burst mode parameters should be > configured, and the exact meaning of half the MIPI_DSI_MODE_* defines > and their interactions (eg MIPI_DSI_VIDEO_MODE_BURST, but not > MIPI_DSI_VIDEO [4]?). > > Cheers > Dave > > [1] https://lists.freedesktop.org/archives/dri-devel/2021-July/313576.html > [2] https://lists.freedesktop.org/archives/dri-devel/2021-October/325853.html > [3] https://elixir.bootlin.com/linux/latest/source/include/drm/drm_mipi_dsi.h#L84 > [4] https://elixir.bootlin.com/linux/latest/source/drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c#L226 > > >>> >>> This specific problem can be fixed only if we change the bridge chain >>> from stack to queue. Please check this series >>> https://patchwork.kernel.org/project/dri-devel/patch/20210214194102.126146-6-jagan@amarulasolutions.com/ >>> >>> Jagan. >>> >>
Hi Maxime, On Mon, Nov 22, 2021 at 7:49 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > Hi Maxime, > > On Mon, Nov 22, 2021 at 7:35 PM Maxime Ripard <maxime@cerno.tech> wrote: > > > > On Mon, Nov 22, 2021 at 07:18:13PM +0530, Jagan Teki wrote: > > > Hi Maxime, > > > > > > On Mon, Nov 22, 2021 at 3:37 PM Maxime Ripard <maxime@cerno.tech> wrote: > > > > > > > > On Mon, Nov 22, 2021 at 12:22:19PM +0530, Jagan Teki wrote: > > > > > Some display panels would come up with a non-DSI output, those > > > > > can have an option to connect the DSI host by means of interface > > > > > bridge converter. > > > > > > > > > > This DSI to non-DSI interface bridge converter would requires > > > > > DSI Host to handle drm bridge functionalities in order to DSI > > > > > Host to Interface bridge. > > > > > > > > In order to do this you would need to use the DRM bridge API... > > > > > > Sorry, which bridge API do you mean? > > > > Any variant of of_drm_find_bridge, and drm_bridge_attach. Just like > > we're doing in sun4i_rgb.c > > Yes, we have drm_bridge_attach in bind and bridge_function.attach > calls in this patch and of_drm_find_bridge in sun6i_mipi_dsi_attach. > Not sure which API's I've missed. > > > > > > > > This patch convert the existing to a drm bridge driver with a > > > > > built-in encoder support for compatibility with existing > > > > > component drivers. > > > > > > > > ... but changing the encoder driver to a bridge is completely > > > > unnecessary to do so. Why did you need to make that change? > > > > > > Idea of this series is to convert the driver to bridge and use the > > > latest bridge function from the v1 series. > > > > Ok, but it's not at all what you mention in your commit log? You don't > > need any of that in order to support a bridge downstream. > > I've mentioned "Converting to bridge driver" and thought it has > meaning of converting encoder related function to bridge functions as > well. Not think about specific description to describe on commit > message. Will update this. > > > > > > > > > > > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > > > > > > > > > > --- > > > > > Changes for v5: > > > > > - add atomic APIs > > > > > - find host and device variant DSI devices. > > > > > Changes for v4, v3: > > > > > - none > > > > > > > > > > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 112 ++++++++++++++++++++----- > > > > > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 7 ++ > > > > > 2 files changed, 96 insertions(+), 23 deletions(-) > > > > > > > > > > diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > > > > > index 43d9c9e5198d..a6a272b55f77 100644 > > > > > --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > > > > > +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > > > > > @@ -21,6 +21,7 @@ > > > > > > > > > > #include <drm/drm_atomic_helper.h> > > > > > #include <drm/drm_mipi_dsi.h> > > > > > +#include <drm/drm_of.h> > > > > > #include <drm/drm_panel.h> > > > > > #include <drm/drm_print.h> > > > > > #include <drm/drm_probe_helper.h> > > > > > @@ -713,10 +714,11 @@ static int sun6i_dsi_start(struct sun6i_dsi *dsi, > > > > > return 0; > > > > > } > > > > > > > > > > -static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > > > > +static void sun6i_dsi_bridge_atomic_enable(struct drm_bridge *bridge, > > > > > + struct drm_bridge_state *old_bridge_state) > > > > > { > > > > > - struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; > > > > > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > > > > > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > > > > + struct drm_display_mode *mode = &bridge->encoder->crtc->state->adjusted_mode; > > > > > struct mipi_dsi_device *device = dsi->device; > > > > > union phy_configure_opts opts = { }; > > > > > struct phy_configure_opts_mipi_dphy *cfg = &opts.mipi_dphy; > > > > > @@ -772,6 +774,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > > > > if (dsi->panel) > > > > > drm_panel_prepare(dsi->panel); > > > > > > > > > > + if (dsi->next_bridge) > > > > > + dsi->next_bridge->funcs->atomic_pre_enable(dsi->next_bridge, old_bridge_state); > > > > > + > > > > > > > > Please use the proper helpers. > > > > > > If we use bridge_functions we need to take atomic functions as > > > precedence as the next bridge functions might convert atomic calls. > > > > We've had this discussion over and over again, but this is something > > that needs to be documented and / or in your commit log. > > > > You must not deviate from the standard (and expected) behavior without > > any kind of justification. > > Not exactly sure about what you mean, sorry. All these atomic bridge > functions are already documented if I'm not wrong and Laurent have > patches to switch the normal functions to atomic. Not sure what else > need to document here and need justification for it if the driver is > converting to bridge. > > > > > > > > > > > > /* > > > > > * FIXME: This should be moved after the switch to HS mode. > > > > > * > > > > > @@ -787,6 +792,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > > > > if (dsi->panel) > > > > > drm_panel_enable(dsi->panel); > > > > > > > > > > + if (dsi->next_bridge) > > > > > + dsi->next_bridge->funcs->atomic_enable(dsi->next_bridge, old_bridge_state); > > > > > + > > > > > > > > Ditto > > > > > > > > > sun6i_dsi_start(dsi, DSI_START_HSC); > > > > > > > > > > udelay(1000); > > > > > @@ -794,15 +802,19 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > > > > sun6i_dsi_start(dsi, DSI_START_HSD); > > > > > } > > > > > > > > > > -static void sun6i_dsi_encoder_disable(struct drm_encoder *encoder) > > > > > +static void sun6i_dsi_bridge_atomic_disable(struct drm_bridge *bridge, > > > > > + struct drm_bridge_state *old_bridge_state) > > > > > { > > > > > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > > > > > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > > > > > > > > > DRM_DEBUG_DRIVER("Disabling DSI output\n"); > > > > > > > > > > if (dsi->panel) { > > > > > drm_panel_disable(dsi->panel); > > > > > drm_panel_unprepare(dsi->panel); > > > > > + } else if (dsi->next_bridge) { > > > > > + dsi->next_bridge->funcs->atomic_disable(dsi->next_bridge, old_bridge_state); > > > > > + dsi->next_bridge->funcs->atomic_post_disable(dsi->next_bridge, old_bridge_state); > > > > > > > > Ditto > > > > > > > > > } > > > > > > > > > > phy_power_off(dsi->dphy); > > > > > @@ -842,9 +854,25 @@ static const struct drm_connector_funcs sun6i_dsi_connector_funcs = { > > > > > .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > > > > > }; > > > > > > > > > > -static const struct drm_encoder_helper_funcs sun6i_dsi_enc_helper_funcs = { > > > > > - .disable = sun6i_dsi_encoder_disable, > > > > > - .enable = sun6i_dsi_encoder_enable, > > > > > +static int sun6i_dsi_bridge_attach(struct drm_bridge *bridge, > > > > > + enum drm_bridge_attach_flags flags) > > > > > +{ > > > > > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > > > > + > > > > > + if (dsi->next_bridge) > > > > > + return drm_bridge_attach(bridge->encoder, dsi->next_bridge, > > > > > + NULL, 0); > > > > > + > > > > > + return 0; > > > > > +} > > > > > + > > > > > +static const struct drm_bridge_funcs sun6i_dsi_bridge_funcs = { > > > > > + .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_enable = sun6i_dsi_bridge_atomic_enable, > > > > > + .atomic_disable = sun6i_dsi_bridge_atomic_disable, > > > > > + .attach = sun6i_dsi_bridge_attach, > > > > > }; > > > > > > > > > > static u32 sun6i_dsi_dcs_build_pkt_hdr(struct sun6i_dsi *dsi, > > > > > @@ -966,8 +994,6 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, > > > > > struct sun6i_dsi *dsi = dev_get_drvdata(dev); > > > > > int ret; > > > > > > > > > > - drm_encoder_helper_add(&dsi->encoder, > > > > > - &sun6i_dsi_enc_helper_funcs); > > > > > ret = drm_simple_encoder_init(drm, &dsi->encoder, > > > > > DRM_MODE_ENCODER_DSI); > > > > > if (ret) { > > > > > @@ -976,18 +1002,26 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, > > > > > } > > > > > dsi->encoder.possible_crtcs = BIT(0); > > > > > > > > > > - drm_connector_helper_add(&dsi->connector, > > > > > - &sun6i_dsi_connector_helper_funcs); > > > > > - ret = drm_connector_init(drm, &dsi->connector, > > > > > - &sun6i_dsi_connector_funcs, > > > > > - DRM_MODE_CONNECTOR_DSI); > > > > > + ret = drm_bridge_attach(&dsi->encoder, &dsi->bridge, NULL, 0); > > > > > if (ret) { > > > > > - dev_err(dsi->dev, > > > > > - "Couldn't initialise the DSI connector\n"); > > > > > + dev_err(dsi->dev, "Couldn't attach drm bridge\n"); > > > > > goto err_cleanup_connector; > > > > > } > > > > > > > > > > - drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); > > > > > + if (dsi->panel) { > > > > > + drm_connector_helper_add(&dsi->connector, > > > > > + &sun6i_dsi_connector_helper_funcs); > > > > > + ret = drm_connector_init(drm, &dsi->connector, > > > > > + &sun6i_dsi_connector_funcs, > > > > > + DRM_MODE_CONNECTOR_DSI); > > > > > + if (ret) { > > > > > + dev_err(dsi->dev, > > > > > + "Couldn't initialise the DSI connector\n"); > > > > > + goto err_cleanup_connector; > > > > > + } > > > > > + > > > > > + drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); > > > > > + } > > > > > > > > > > return 0; > > > > > > > > > > @@ -1013,16 +1047,46 @@ static int sun6i_dsi_attach(struct mipi_dsi_host *host, > > > > > struct mipi_dsi_device *device) > > > > > { > > > > > struct sun6i_dsi *dsi = host_to_sun6i_dsi(host); > > > > > - struct drm_panel *panel = of_drm_find_panel(device->dev.of_node); > > > > > + struct device_node *remote = device->dev.of_node; > > > > > int ret; > > > > > > > > > > - if (IS_ERR(panel)) > > > > > - return PTR_ERR(panel); > > > > > + if (!of_device_is_available(remote)) { > > > > > + /** > > > > > + * I2C interfaced DSI bridges will register DSI host on the > > > > > + * bridge drivers instead of conventional device. > > > > > + * > > > > > + * Those are probed via host of_node instead of device of_node. > > > > > + */ > > > > > > > > I have no idea what you mean here. Can you expand on what issue you've > > > > tried to solve here? > > > > > > I2C interface DSI bridges will register DSI host on the bridge > > > drivers. > > > > DSI bridges don't register a DSI host. > > Please check what I mean here, > https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/drivers/gpu/drm/bridge/ti-sn65dsi83.c#n623 > > I've tested it anyway, if you have any relevant one please check as well. > > > > > > Those can be found using host->dev->of_node and cannot be find using > > > device->dev.of_node > > > > > > > > > > > > + remote = of_graph_get_remote_node(host->dev->of_node, 0, 0); > > > > > + if (!remote) > > > > > + return -ENODEV; > > > > > + } > > > > > + > > > > > + dsi->panel = of_drm_find_panel(remote); > > > > > + if (IS_ERR(dsi->panel)) { > > > > > + dsi->panel = NULL; > > > > > + > > > > > + dsi->next_bridge = of_drm_find_bridge(remote); > > > > > + if (IS_ERR(dsi->next_bridge)) { > > > > > + dev_err(dsi->dev, "failed to find bridge\n"); > > > > > + return PTR_ERR(dsi->next_bridge); > > > > > + } > > > > > + } else { > > > > > + dsi->next_bridge = NULL; > > > > > + } > > > > > + > > > > > + of_node_put(remote); > > > > > > > > Using devm_drm_of_get_bridge would greatly simplify the driver > > > > > > I'm aware of this and this would break the existing sunxi dsi binding, > > > we are not using ports based pipeline in dsi node. Of-course you have > > > pointed the same before, please check below > > > https://patchwork.kernel.org/project/dri-devel/patch/20210322140152.101709-2-jagan@amarulasolutions.com/ > > > > Then drm_of_find_panel_or_bridge needs to be adjusted to handle the DSI > > bindings and look for a panel or bridge not only through the OF graph, > > but also on the child nodes > > Okay. I need to check this. devm_drm_of_get_bridge is not working with legacy binding like the one used in sun6i dsi https://patchwork.kernel.org/project/dri-devel/patch/20211122065223.88059-6-jagan@amarulasolutions.com/ dsi->next_bridge = devm_drm_of_get_bridge(dsi->dev, dsi->dev->of_node, 0, 0); if (IS_ERR(dsi->next_bridge)) return PTR_ERR(dsi->next_bridge); It is only working if we have ports on the pipeline, something like this https://patchwork.kernel.org/project/dri-devel/patch/20210214194102.126146-8-jagan@amarulasolutions.com/ Please have a look and let me know if I miss anything? Jagan.
On Wed, Nov 24, 2021 at 12:02:47AM +0530, Jagan Teki wrote: > > > > > > + dsi->panel = of_drm_find_panel(remote); > > > > > > + if (IS_ERR(dsi->panel)) { > > > > > > + dsi->panel = NULL; > > > > > > + > > > > > > + dsi->next_bridge = of_drm_find_bridge(remote); > > > > > > + if (IS_ERR(dsi->next_bridge)) { > > > > > > + dev_err(dsi->dev, "failed to find bridge\n"); > > > > > > + return PTR_ERR(dsi->next_bridge); > > > > > > + } > > > > > > + } else { > > > > > > + dsi->next_bridge = NULL; > > > > > > + } > > > > > > + > > > > > > + of_node_put(remote); > > > > > > > > > > Using devm_drm_of_get_bridge would greatly simplify the driver > > > > > > > > I'm aware of this and this would break the existing sunxi dsi binding, > > > > we are not using ports based pipeline in dsi node. Of-course you have > > > > pointed the same before, please check below > > > > https://patchwork.kernel.org/project/dri-devel/patch/20210322140152.101709-2-jagan@amarulasolutions.com/ > > > > > > Then drm_of_find_panel_or_bridge needs to be adjusted to handle the DSI > > > bindings and look for a panel or bridge not only through the OF graph, > > > but also on the child nodes > > > > Okay. I need to check this. > > devm_drm_of_get_bridge is not working with legacy binding like the one > used in sun6i dsi There's nothing legacy about it. > https://patchwork.kernel.org/project/dri-devel/patch/20211122065223.88059-6-jagan@amarulasolutions.com/ > > dsi->next_bridge = devm_drm_of_get_bridge(dsi->dev, dsi->dev->of_node, 0, 0); > if (IS_ERR(dsi->next_bridge)) > return PTR_ERR(dsi->next_bridge); > > It is only working if we have ports on the pipeline, something like this > https://patchwork.kernel.org/project/dri-devel/patch/20210214194102.126146-8-jagan@amarulasolutions.com/ > > Please have a look and let me know if I miss anything? Yes, you're missing the answer you quoted earlier: > > > Then drm_of_find_panel_or_bridge needs to be adjusted to handle the DSI > > > bindings and look for a panel or bridge not only through the OF graph, > > > but also on the child nodes Maxime
Hi, On Thu, Nov 25, 2021 at 7:45 PM Maxime Ripard <maxime@cerno.tech> wrote: > > On Wed, Nov 24, 2021 at 12:02:47AM +0530, Jagan Teki wrote: > > > > > > > + dsi->panel = of_drm_find_panel(remote); > > > > > > > + if (IS_ERR(dsi->panel)) { > > > > > > > + dsi->panel = NULL; > > > > > > > + > > > > > > > + dsi->next_bridge = of_drm_find_bridge(remote); > > > > > > > + if (IS_ERR(dsi->next_bridge)) { > > > > > > > + dev_err(dsi->dev, "failed to find bridge\n"); > > > > > > > + return PTR_ERR(dsi->next_bridge); > > > > > > > + } > > > > > > > + } else { > > > > > > > + dsi->next_bridge = NULL; > > > > > > > + } > > > > > > > + > > > > > > > + of_node_put(remote); > > > > > > > > > > > > Using devm_drm_of_get_bridge would greatly simplify the driver > > > > > > > > > > I'm aware of this and this would break the existing sunxi dsi binding, > > > > > we are not using ports based pipeline in dsi node. Of-course you have > > > > > pointed the same before, please check below > > > > > https://patchwork.kernel.org/project/dri-devel/patch/20210322140152.101709-2-jagan@amarulasolutions.com/ > > > > > > > > Then drm_of_find_panel_or_bridge needs to be adjusted to handle the DSI > > > > bindings and look for a panel or bridge not only through the OF graph, > > > > but also on the child nodes > > > > > > Okay. I need to check this. > > > > devm_drm_of_get_bridge is not working with legacy binding like the one > > used in sun6i dsi > > There's nothing legacy about it. What I'm mean legacy here with current binding used in sun6i-dsi like this. &dsi { vcc-dsi-supply = <®_dcdc1>; /* VCC-DSI */ status = "okay"; panel@0 { compatible = "bananapi,s070wv20-ct16-icn6211"; reg = <0>; reset-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* LCD-RST: PL5 */ enable-gpios = <&pio 1 7 GPIO_ACTIVE_HIGH>; /* LCD-PWR-EN: PB7 */ backlight = <&backlight>; }; }; devm_drm_of_get_bridge cannot find the device with above binding and able to find the device with below binding. &dsi { vcc-dsi-supply = <®_dcdc1>; /* VCC-DSI */ status = "okay"; ports { #address-cells = <1>; #size-cells = <0>; dsi_out: port@0 { reg = <0>; dsi_out_bridge: endpoint { remote-endpoint = <&bridge_out_dsi>; }; }; }; panel@0 { compatible = "bananapi,s070wv20-ct16-icn6211"; reg = <0>; reset-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* LCD-RST: PL5 */ enable-gpios = <&pio 1 7 GPIO_ACTIVE_HIGH>; /* LCD-PWR-EN: PB7 */ backlight = <&backlight>; port { bridge_out_dsi: endpoint { remote-endpoint = <&dsi_out_bridge>; }; }; }; }; > > > https://patchwork.kernel.org/project/dri-devel/patch/20211122065223.88059-6-jagan@amarulasolutions.com/ > > > > dsi->next_bridge = devm_drm_of_get_bridge(dsi->dev, dsi->dev->of_node, 0, 0); > > if (IS_ERR(dsi->next_bridge)) > > return PTR_ERR(dsi->next_bridge); > > > > It is only working if we have ports on the pipeline, something like this > > https://patchwork.kernel.org/project/dri-devel/patch/20210214194102.126146-8-jagan@amarulasolutions.com/ > > > > Please have a look and let me know if I miss anything? > > Yes, you're missing the answer you quoted earlier: Yes, I'm trying to resolve the comment one after another. Will get back. Thanks, Jagan.
On Thu, Nov 25, 2021 at 07:55:41PM +0530, Jagan Teki wrote: > Hi, > > On Thu, Nov 25, 2021 at 7:45 PM Maxime Ripard <maxime@cerno.tech> wrote: > > > > On Wed, Nov 24, 2021 at 12:02:47AM +0530, Jagan Teki wrote: > > > > > > > > + dsi->panel = of_drm_find_panel(remote); > > > > > > > > + if (IS_ERR(dsi->panel)) { > > > > > > > > + dsi->panel = NULL; > > > > > > > > + > > > > > > > > + dsi->next_bridge = of_drm_find_bridge(remote); > > > > > > > > + if (IS_ERR(dsi->next_bridge)) { > > > > > > > > + dev_err(dsi->dev, "failed to find bridge\n"); > > > > > > > > + return PTR_ERR(dsi->next_bridge); > > > > > > > > + } > > > > > > > > + } else { > > > > > > > > + dsi->next_bridge = NULL; > > > > > > > > + } > > > > > > > > + > > > > > > > > + of_node_put(remote); > > > > > > > > > > > > > > Using devm_drm_of_get_bridge would greatly simplify the driver > > > > > > > > > > > > I'm aware of this and this would break the existing sunxi dsi binding, > > > > > > we are not using ports based pipeline in dsi node. Of-course you have > > > > > > pointed the same before, please check below > > > > > > https://patchwork.kernel.org/project/dri-devel/patch/20210322140152.101709-2-jagan@amarulasolutions.com/ > > > > > > > > > > Then drm_of_find_panel_or_bridge needs to be adjusted to handle the DSI > > > > > bindings and look for a panel or bridge not only through the OF graph, > > > > > but also on the child nodes > > > > > > > > Okay. I need to check this. > > > > > > devm_drm_of_get_bridge is not working with legacy binding like the one > > > used in sun6i dsi > > > > There's nothing legacy about it. > > What I'm mean legacy here with current binding used in sun6i-dsi like this. > > &dsi { > vcc-dsi-supply = <®_dcdc1>; /* VCC-DSI */ > status = "okay"; > > panel@0 { > compatible = "bananapi,s070wv20-ct16-icn6211"; > reg = <0>; > reset-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* > LCD-RST: PL5 */ > enable-gpios = <&pio 1 7 GPIO_ACTIVE_HIGH>; /* > LCD-PWR-EN: PB7 */ > backlight = <&backlight>; > }; > }; Yes, I know, it's the generic DSI binding. It's still not legacy. > devm_drm_of_get_bridge cannot find the device with above binding and > able to find the device with below binding. > > &dsi { > vcc-dsi-supply = <®_dcdc1>; /* VCC-DSI */ > status = "okay"; > > ports { > #address-cells = <1>; > #size-cells = <0>; > > dsi_out: port@0 { > reg = <0>; > > dsi_out_bridge: endpoint { > remote-endpoint = <&bridge_out_dsi>; > }; > }; > }; > > panel@0 { > compatible = "bananapi,s070wv20-ct16-icn6211"; > reg = <0>; > reset-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* LCD-RST: PL5 */ > enable-gpios = <&pio 1 7 GPIO_ACTIVE_HIGH>; /* LCD-PWR-EN: PB7 */ > backlight = <&backlight>; > > port { > bridge_out_dsi: endpoint { > remote-endpoint = <&dsi_out_bridge>; > }; > }; > }; > }; Yes, I know, and that's because ... > > > > > https://patchwork.kernel.org/project/dri-devel/patch/20211122065223.88059-6-jagan@amarulasolutions.com/ > > > > > > dsi->next_bridge = devm_drm_of_get_bridge(dsi->dev, dsi->dev->of_node, 0, 0); > > > if (IS_ERR(dsi->next_bridge)) > > > return PTR_ERR(dsi->next_bridge); > > > > > > It is only working if we have ports on the pipeline, something like this > > > https://patchwork.kernel.org/project/dri-devel/patch/20210214194102.126146-8-jagan@amarulasolutions.com/ > > > > > > Please have a look and let me know if I miss anything? > > > > Yes, you're missing the answer you quoted earlier: > > Yes, I'm trying to resolve the comment one after another. Will get back. ... You've ignored that comment. Maxime
On Thu, Nov 25, 2021 at 9:40 PM Maxime Ripard <maxime@cerno.tech> wrote: > > On Thu, Nov 25, 2021 at 07:55:41PM +0530, Jagan Teki wrote: > > Hi, > > > > On Thu, Nov 25, 2021 at 7:45 PM Maxime Ripard <maxime@cerno.tech> wrote: > > > > > > On Wed, Nov 24, 2021 at 12:02:47AM +0530, Jagan Teki wrote: > > > > > > > > > + dsi->panel = of_drm_find_panel(remote); > > > > > > > > > + if (IS_ERR(dsi->panel)) { > > > > > > > > > + dsi->panel = NULL; > > > > > > > > > + > > > > > > > > > + dsi->next_bridge = of_drm_find_bridge(remote); > > > > > > > > > + if (IS_ERR(dsi->next_bridge)) { > > > > > > > > > + dev_err(dsi->dev, "failed to find bridge\n"); > > > > > > > > > + return PTR_ERR(dsi->next_bridge); > > > > > > > > > + } > > > > > > > > > + } else { > > > > > > > > > + dsi->next_bridge = NULL; > > > > > > > > > + } > > > > > > > > > + > > > > > > > > > + of_node_put(remote); > > > > > > > > > > > > > > > > Using devm_drm_of_get_bridge would greatly simplify the driver > > > > > > > > > > > > > > I'm aware of this and this would break the existing sunxi dsi binding, > > > > > > > we are not using ports based pipeline in dsi node. Of-course you have > > > > > > > pointed the same before, please check below > > > > > > > https://patchwork.kernel.org/project/dri-devel/patch/20210322140152.101709-2-jagan@amarulasolutions.com/ > > > > > > > > > > > > Then drm_of_find_panel_or_bridge needs to be adjusted to handle the DSI > > > > > > bindings and look for a panel or bridge not only through the OF graph, > > > > > > but also on the child nodes > > > > > > > > > > Okay. I need to check this. > > > > > > > > devm_drm_of_get_bridge is not working with legacy binding like the one > > > > used in sun6i dsi > > > > > > There's nothing legacy about it. > > > > What I'm mean legacy here with current binding used in sun6i-dsi like this. > > > > &dsi { > > vcc-dsi-supply = <®_dcdc1>; /* VCC-DSI */ > > status = "okay"; > > > > panel@0 { > > compatible = "bananapi,s070wv20-ct16-icn6211"; > > reg = <0>; > > reset-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* > > LCD-RST: PL5 */ > > enable-gpios = <&pio 1 7 GPIO_ACTIVE_HIGH>; /* > > LCD-PWR-EN: PB7 */ > > backlight = <&backlight>; > > }; > > }; > > Yes, I know, it's the generic DSI binding. It's still not legacy. > > > devm_drm_of_get_bridge cannot find the device with above binding and > > able to find the device with below binding. > > > > &dsi { > > vcc-dsi-supply = <®_dcdc1>; /* VCC-DSI */ > > status = "okay"; > > > > ports { > > #address-cells = <1>; > > #size-cells = <0>; > > > > dsi_out: port@0 { > > reg = <0>; > > > > dsi_out_bridge: endpoint { > > remote-endpoint = <&bridge_out_dsi>; > > }; > > }; > > }; > > > > panel@0 { > > compatible = "bananapi,s070wv20-ct16-icn6211"; > > reg = <0>; > > reset-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* LCD-RST: PL5 */ > > enable-gpios = <&pio 1 7 GPIO_ACTIVE_HIGH>; /* LCD-PWR-EN: PB7 */ > > backlight = <&backlight>; > > > > port { > > bridge_out_dsi: endpoint { > > remote-endpoint = <&dsi_out_bridge>; > > }; > > }; > > }; > > }; > > Yes, I know, and that's because ... Okay. I will use find panel and bridge separately instead of devm_drm_of_get_bridge in version patches. > > > > > > > > https://patchwork.kernel.org/project/dri-devel/patch/20211122065223.88059-6-jagan@amarulasolutions.com/ > > > > > > > > dsi->next_bridge = devm_drm_of_get_bridge(dsi->dev, dsi->dev->of_node, 0, 0); > > > > if (IS_ERR(dsi->next_bridge)) > > > > return PTR_ERR(dsi->next_bridge); > > > > > > > > It is only working if we have ports on the pipeline, something like this > > > > https://patchwork.kernel.org/project/dri-devel/patch/20210214194102.126146-8-jagan@amarulasolutions.com/ > > > > > > > > Please have a look and let me know if I miss anything? > > > > > > Yes, you're missing the answer you quoted earlier: > > > > Yes, I'm trying to resolve the comment one after another. Will get back. > > ... You've ignored that comment. Not understand which comment you mean. There are few about bridge conversion details, I will send my comments. Thanks, Jagan.
On Mon, Nov 22, 2021 at 8:34 PM Maxime Ripard <maxime@cerno.tech> wrote: > > On Mon, Nov 22, 2021 at 07:49:26PM +0530, Jagan Teki wrote: > > On Mon, Nov 22, 2021 at 7:35 PM Maxime Ripard <maxime@cerno.tech> wrote: > > > On Mon, Nov 22, 2021 at 07:18:13PM +0530, Jagan Teki wrote: > > > > On Mon, Nov 22, 2021 at 3:37 PM Maxime Ripard <maxime@cerno.tech> wrote: > > > > > > > > > > On Mon, Nov 22, 2021 at 12:22:19PM +0530, Jagan Teki wrote: > > > > > > Some display panels would come up with a non-DSI output, those > > > > > > can have an option to connect the DSI host by means of interface > > > > > > bridge converter. > > > > > > > > > > > > This DSI to non-DSI interface bridge converter would requires > > > > > > DSI Host to handle drm bridge functionalities in order to DSI > > > > > > Host to Interface bridge. > > > > > > > > > > In order to do this you would need to use the DRM bridge API... > > > > > > > > Sorry, which bridge API do you mean? > > > > > > Any variant of of_drm_find_bridge, and drm_bridge_attach. Just like > > > we're doing in sun4i_rgb.c > > > > Yes, we have drm_bridge_attach in bind and bridge_function.attach > > calls in this patch and of_drm_find_bridge in sun6i_mipi_dsi_attach. > > Not sure which API's I've missed. > > None, that's my point, you don't need anything else in order to do what > you wanted to achieve. Correct, the order is some how confused in this patch. I will fix it in next version. > > > > > > > > > > This patch convert the existing to a drm bridge driver with a > > > > > > built-in encoder support for compatibility with existing > > > > > > component drivers. > > > > > > > > > > ... but changing the encoder driver to a bridge is completely > > > > > unnecessary to do so. Why did you need to make that change? > > > > > > > > Idea of this series is to convert the driver to bridge and use the > > > > latest bridge function from the v1 series. > > > > > > Ok, but it's not at all what you mention in your commit log? You don't > > > need any of that in order to support a bridge downstream. > > > > I've mentioned "Converting to bridge driver" and thought it has > > meaning of converting encoder related function to bridge functions as > > well. Not think about specific description to describe on commit > > message. Will update this. > > But you provided no reason to do so. The only one you did mention was > that you wanted to support downstream bridges, but you don't need to > convert the DSI driver to a bridge in order to do that. Okay. Look like I've combined both downstream bridge support and converting bridge together. This what it totally confused, I will fix it. > > > > > > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > > > > > > > > > > > > --- > > > > > > Changes for v5: > > > > > > - add atomic APIs > > > > > > - find host and device variant DSI devices. > > > > > > Changes for v4, v3: > > > > > > - none > > > > > > > > > > > > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 112 ++++++++++++++++++++----- > > > > > > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 7 ++ > > > > > > 2 files changed, 96 insertions(+), 23 deletions(-) > > > > > > > > > > > > diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > > > > > > index 43d9c9e5198d..a6a272b55f77 100644 > > > > > > --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > > > > > > +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > > > > > > @@ -21,6 +21,7 @@ > > > > > > > > > > > > #include <drm/drm_atomic_helper.h> > > > > > > #include <drm/drm_mipi_dsi.h> > > > > > > +#include <drm/drm_of.h> > > > > > > #include <drm/drm_panel.h> > > > > > > #include <drm/drm_print.h> > > > > > > #include <drm/drm_probe_helper.h> > > > > > > @@ -713,10 +714,11 @@ static int sun6i_dsi_start(struct sun6i_dsi *dsi, > > > > > > return 0; > > > > > > } > > > > > > > > > > > > -static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > > > > > +static void sun6i_dsi_bridge_atomic_enable(struct drm_bridge *bridge, > > > > > > + struct drm_bridge_state *old_bridge_state) > > > > > > { > > > > > > - struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; > > > > > > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > > > > > > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > > > > > + struct drm_display_mode *mode = &bridge->encoder->crtc->state->adjusted_mode; > > > > > > struct mipi_dsi_device *device = dsi->device; > > > > > > union phy_configure_opts opts = { }; > > > > > > struct phy_configure_opts_mipi_dphy *cfg = &opts.mipi_dphy; > > > > > > @@ -772,6 +774,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > > > > > if (dsi->panel) > > > > > > drm_panel_prepare(dsi->panel); > > > > > > > > > > > > + if (dsi->next_bridge) > > > > > > + dsi->next_bridge->funcs->atomic_pre_enable(dsi->next_bridge, old_bridge_state); > > > > > > + > > > > > > > > > > Please use the proper helpers. > > > > > > > > If we use bridge_functions we need to take atomic functions as > > > > precedence as the next bridge functions might convert atomic calls. > > > > > > We've had this discussion over and over again, but this is something > > > that needs to be documented and / or in your commit log. > > > > > > You must not deviate from the standard (and expected) behavior without > > > any kind of justification. > > > > Not exactly sure about what you mean, sorry. All these atomic bridge > > functions are already documented if I'm not wrong and Laurent have > > patches to switch the normal functions to atomic. Not sure what else > > need to document here and need justification for it if the driver is > > converting to bridge. > > There's two separate bridge in that discussion: the DSI controller > itself that you convert to a bridge, and the downstream DSI -> whatever > bridge. > > The atomic functions in the "DSI controller bridge" are fine. But that > comment was about calling the downstream bridge ops directly from the > driver, which is something that no other driver is doing, deviates from > the expectations, and you didn't provide any explanation for that. Clear for me now. Agreed what you are saying. > > > > > > > > > > > > > > > /* > > > > > > * FIXME: This should be moved after the switch to HS mode. > > > > > > * > > > > > > @@ -787,6 +792,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > > > > > if (dsi->panel) > > > > > > drm_panel_enable(dsi->panel); > > > > > > > > > > > > + if (dsi->next_bridge) > > > > > > + dsi->next_bridge->funcs->atomic_enable(dsi->next_bridge, old_bridge_state); > > > > > > + > > > > > > > > > > Ditto > > > > > > > > > > > sun6i_dsi_start(dsi, DSI_START_HSC); > > > > > > > > > > > > udelay(1000); > > > > > > @@ -794,15 +802,19 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > > > > > > sun6i_dsi_start(dsi, DSI_START_HSD); > > > > > > } > > > > > > > > > > > > -static void sun6i_dsi_encoder_disable(struct drm_encoder *encoder) > > > > > > +static void sun6i_dsi_bridge_atomic_disable(struct drm_bridge *bridge, > > > > > > + struct drm_bridge_state *old_bridge_state) > > > > > > { > > > > > > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > > > > > > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > > > > > > > > > > > DRM_DEBUG_DRIVER("Disabling DSI output\n"); > > > > > > > > > > > > if (dsi->panel) { > > > > > > drm_panel_disable(dsi->panel); > > > > > > drm_panel_unprepare(dsi->panel); > > > > > > + } else if (dsi->next_bridge) { > > > > > > + dsi->next_bridge->funcs->atomic_disable(dsi->next_bridge, old_bridge_state); > > > > > > + dsi->next_bridge->funcs->atomic_post_disable(dsi->next_bridge, old_bridge_state); > > > > > > > > > > Ditto > > > > > > > > > > > } > > > > > > > > > > > > phy_power_off(dsi->dphy); > > > > > > @@ -842,9 +854,25 @@ static const struct drm_connector_funcs sun6i_dsi_connector_funcs = { > > > > > > .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > > > > > > }; > > > > > > > > > > > > -static const struct drm_encoder_helper_funcs sun6i_dsi_enc_helper_funcs = { > > > > > > - .disable = sun6i_dsi_encoder_disable, > > > > > > - .enable = sun6i_dsi_encoder_enable, > > > > > > +static int sun6i_dsi_bridge_attach(struct drm_bridge *bridge, > > > > > > + enum drm_bridge_attach_flags flags) > > > > > > +{ > > > > > > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > > > > > + > > > > > > + if (dsi->next_bridge) > > > > > > + return drm_bridge_attach(bridge->encoder, dsi->next_bridge, > > > > > > + NULL, 0); > > > > > > + > > > > > > + return 0; > > > > > > +} > > > > > > + > > > > > > +static const struct drm_bridge_funcs sun6i_dsi_bridge_funcs = { > > > > > > + .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_enable = sun6i_dsi_bridge_atomic_enable, > > > > > > + .atomic_disable = sun6i_dsi_bridge_atomic_disable, > > > > > > + .attach = sun6i_dsi_bridge_attach, > > > > > > }; > > > > > > > > > > > > static u32 sun6i_dsi_dcs_build_pkt_hdr(struct sun6i_dsi *dsi, > > > > > > @@ -966,8 +994,6 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, > > > > > > struct sun6i_dsi *dsi = dev_get_drvdata(dev); > > > > > > int ret; > > > > > > > > > > > > - drm_encoder_helper_add(&dsi->encoder, > > > > > > - &sun6i_dsi_enc_helper_funcs); > > > > > > ret = drm_simple_encoder_init(drm, &dsi->encoder, > > > > > > DRM_MODE_ENCODER_DSI); > > > > > > if (ret) { > > > > > > @@ -976,18 +1002,26 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, > > > > > > } > > > > > > dsi->encoder.possible_crtcs = BIT(0); > > > > > > > > > > > > - drm_connector_helper_add(&dsi->connector, > > > > > > - &sun6i_dsi_connector_helper_funcs); > > > > > > - ret = drm_connector_init(drm, &dsi->connector, > > > > > > - &sun6i_dsi_connector_funcs, > > > > > > - DRM_MODE_CONNECTOR_DSI); > > > > > > + ret = drm_bridge_attach(&dsi->encoder, &dsi->bridge, NULL, 0); > > > > > > if (ret) { > > > > > > - dev_err(dsi->dev, > > > > > > - "Couldn't initialise the DSI connector\n"); > > > > > > + dev_err(dsi->dev, "Couldn't attach drm bridge\n"); > > > > > > goto err_cleanup_connector; > > > > > > } > > > > > > > > > > > > - drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); > > > > > > + if (dsi->panel) { > > > > > > + drm_connector_helper_add(&dsi->connector, > > > > > > + &sun6i_dsi_connector_helper_funcs); > > > > > > + ret = drm_connector_init(drm, &dsi->connector, > > > > > > + &sun6i_dsi_connector_funcs, > > > > > > + DRM_MODE_CONNECTOR_DSI); > > > > > > + if (ret) { > > > > > > + dev_err(dsi->dev, > > > > > > + "Couldn't initialise the DSI connector\n"); > > > > > > + goto err_cleanup_connector; > > > > > > + } > > > > > > + > > > > > > + drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); > > > > > > + } > > > > > > > > > > > > return 0; > > > > > > > > > > > > @@ -1013,16 +1047,46 @@ static int sun6i_dsi_attach(struct mipi_dsi_host *host, > > > > > > struct mipi_dsi_device *device) > > > > > > { > > > > > > struct sun6i_dsi *dsi = host_to_sun6i_dsi(host); > > > > > > - struct drm_panel *panel = of_drm_find_panel(device->dev.of_node); > > > > > > + struct device_node *remote = device->dev.of_node; > > > > > > int ret; > > > > > > > > > > > > - if (IS_ERR(panel)) > > > > > > - return PTR_ERR(panel); > > > > > > + if (!of_device_is_available(remote)) { > > > > > > + /** > > > > > > + * I2C interfaced DSI bridges will register DSI host on the > > > > > > + * bridge drivers instead of conventional device. > > > > > > + * > > > > > > + * Those are probed via host of_node instead of device of_node. > > > > > > + */ > > > > > > > > > > I have no idea what you mean here. Can you expand on what issue you've > > > > > tried to solve here? > > > > > > > > I2C interface DSI bridges will register DSI host on the bridge > > > > drivers. > > > > > > DSI bridges don't register a DSI host. > > > > Please check what I mean here, > > https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/drivers/gpu/drm/bridge/ti-sn65dsi83.c#n623 > > > > I've tested it anyway, if you have any relevant one please check as well. > > That driver doesn't register a DSI Host though? It registers a DSI > device Correct. Thanks, Jagan.
On Thu, Nov 25, 2021 at 09:44:14PM +0530, Jagan Teki wrote: > On Thu, Nov 25, 2021 at 9:40 PM Maxime Ripard <maxime@cerno.tech> wrote: > > > > On Thu, Nov 25, 2021 at 07:55:41PM +0530, Jagan Teki wrote: > > > Hi, > > > > > > On Thu, Nov 25, 2021 at 7:45 PM Maxime Ripard <maxime@cerno.tech> wrote: > > > > > > > > On Wed, Nov 24, 2021 at 12:02:47AM +0530, Jagan Teki wrote: > > > > > > > > > > + dsi->panel = of_drm_find_panel(remote); > > > > > > > > > > + if (IS_ERR(dsi->panel)) { > > > > > > > > > > + dsi->panel = NULL; > > > > > > > > > > + > > > > > > > > > > + dsi->next_bridge = of_drm_find_bridge(remote); > > > > > > > > > > + if (IS_ERR(dsi->next_bridge)) { > > > > > > > > > > + dev_err(dsi->dev, "failed to find bridge\n"); > > > > > > > > > > + return PTR_ERR(dsi->next_bridge); > > > > > > > > > > + } > > > > > > > > > > + } else { > > > > > > > > > > + dsi->next_bridge = NULL; > > > > > > > > > > + } > > > > > > > > > > + > > > > > > > > > > + of_node_put(remote); > > > > > > > > > > > > > > > > > > Using devm_drm_of_get_bridge would greatly simplify the driver > > > > > > > > > > > > > > > > I'm aware of this and this would break the existing sunxi dsi binding, > > > > > > > > we are not using ports based pipeline in dsi node. Of-course you have > > > > > > > > pointed the same before, please check below > > > > > > > > https://patchwork.kernel.org/project/dri-devel/patch/20210322140152.101709-2-jagan@amarulasolutions.com/ > > > > > > > > > > > > > > Then drm_of_find_panel_or_bridge needs to be adjusted to handle the DSI > > > > > > > bindings and look for a panel or bridge not only through the OF graph, > > > > > > > but also on the child nodes > > > > > > > > > > > > Okay. I need to check this. > > > > > > > > > > devm_drm_of_get_bridge is not working with legacy binding like the one > > > > > used in sun6i dsi > > > > > > > > There's nothing legacy about it. > > > > > > What I'm mean legacy here with current binding used in sun6i-dsi like this. > > > > > > &dsi { > > > vcc-dsi-supply = <®_dcdc1>; /* VCC-DSI */ > > > status = "okay"; > > > > > > panel@0 { > > > compatible = "bananapi,s070wv20-ct16-icn6211"; > > > reg = <0>; > > > reset-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* > > > LCD-RST: PL5 */ > > > enable-gpios = <&pio 1 7 GPIO_ACTIVE_HIGH>; /* > > > LCD-PWR-EN: PB7 */ > > > backlight = <&backlight>; > > > }; > > > }; > > > > Yes, I know, it's the generic DSI binding. It's still not legacy. > > > > > devm_drm_of_get_bridge cannot find the device with above binding and > > > able to find the device with below binding. > > > > > > &dsi { > > > vcc-dsi-supply = <®_dcdc1>; /* VCC-DSI */ > > > status = "okay"; > > > > > > ports { > > > #address-cells = <1>; > > > #size-cells = <0>; > > > > > > dsi_out: port@0 { > > > reg = <0>; > > > > > > dsi_out_bridge: endpoint { > > > remote-endpoint = <&bridge_out_dsi>; > > > }; > > > }; > > > }; > > > > > > panel@0 { > > > compatible = "bananapi,s070wv20-ct16-icn6211"; > > > reg = <0>; > > > reset-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* LCD-RST: PL5 */ > > > enable-gpios = <&pio 1 7 GPIO_ACTIVE_HIGH>; /* LCD-PWR-EN: PB7 */ > > > backlight = <&backlight>; > > > > > > port { > > > bridge_out_dsi: endpoint { > > > remote-endpoint = <&dsi_out_bridge>; > > > }; > > > }; > > > }; > > > }; > > > > Yes, I know, and that's because ... > > Okay. I will use find panel and bridge separately instead of > devm_drm_of_get_bridge in version patches. That's not been my point, at all? I mean, that whole discussion has been because you shouldn't do that. > > > > > > > > > > > https://patchwork.kernel.org/project/dri-devel/patch/20211122065223.88059-6-jagan@amarulasolutions.com/ > > > > > > > > > > dsi->next_bridge = devm_drm_of_get_bridge(dsi->dev, dsi->dev->of_node, 0, 0); > > > > > if (IS_ERR(dsi->next_bridge)) > > > > > return PTR_ERR(dsi->next_bridge); > > > > > > > > > > It is only working if we have ports on the pipeline, something like this > > > > > https://patchwork.kernel.org/project/dri-devel/patch/20210214194102.126146-8-jagan@amarulasolutions.com/ > > > > > > > > > > Please have a look and let me know if I miss anything? > > > > > > > > Yes, you're missing the answer you quoted earlier: > > > > > > Yes, I'm trying to resolve the comment one after another. Will get back. > > > > ... You've ignored that comment. > > Not understand which comment you mean. There are few about bridge > conversion details, I will send my comments. The one that got quoted there and you removed. For reference: > Then drm_of_find_panel_or_bridge needs to be adjusted to handle the DSI > bindings and look for a panel or bridge not only through the OF graph, > but also on the child nodes devm_drm_of_get_bridge uses drm_of_find_panel_or_bridge under the hood, so of course it won't find it if drm_of_find_panel_or_bridge doesn't. You need to modify drm_of_find_panel_or_bridge to also look for child devices and see if there's a panel or bridge registered for that child node. Then devm_drm_of_get_bridge will work as you intend it to. Maxime
On Fri, Nov 26, 2021 at 9:34 PM Maxime Ripard <maxime@cerno.tech> wrote: > > On Thu, Nov 25, 2021 at 09:44:14PM +0530, Jagan Teki wrote: > > On Thu, Nov 25, 2021 at 9:40 PM Maxime Ripard <maxime@cerno.tech> wrote: > > > > > > On Thu, Nov 25, 2021 at 07:55:41PM +0530, Jagan Teki wrote: > > > > Hi, > > > > > > > > On Thu, Nov 25, 2021 at 7:45 PM Maxime Ripard <maxime@cerno.tech> wrote: > > > > > > > > > > On Wed, Nov 24, 2021 at 12:02:47AM +0530, Jagan Teki wrote: > > > > > > > > > > > + dsi->panel = of_drm_find_panel(remote); > > > > > > > > > > > + if (IS_ERR(dsi->panel)) { > > > > > > > > > > > + dsi->panel = NULL; > > > > > > > > > > > + > > > > > > > > > > > + dsi->next_bridge = of_drm_find_bridge(remote); > > > > > > > > > > > + if (IS_ERR(dsi->next_bridge)) { > > > > > > > > > > > + dev_err(dsi->dev, "failed to find bridge\n"); > > > > > > > > > > > + return PTR_ERR(dsi->next_bridge); > > > > > > > > > > > + } > > > > > > > > > > > + } else { > > > > > > > > > > > + dsi->next_bridge = NULL; > > > > > > > > > > > + } > > > > > > > > > > > + > > > > > > > > > > > + of_node_put(remote); > > > > > > > > > > > > > > > > > > > > Using devm_drm_of_get_bridge would greatly simplify the driver > > > > > > > > > > > > > > > > > > I'm aware of this and this would break the existing sunxi dsi binding, > > > > > > > > > we are not using ports based pipeline in dsi node. Of-course you have > > > > > > > > > pointed the same before, please check below > > > > > > > > > https://patchwork.kernel.org/project/dri-devel/patch/20210322140152.101709-2-jagan@amarulasolutions.com/ > > > > > > > > > > > > > > > > Then drm_of_find_panel_or_bridge needs to be adjusted to handle the DSI > > > > > > > > bindings and look for a panel or bridge not only through the OF graph, > > > > > > > > but also on the child nodes > > > > > > > > > > > > > > Okay. I need to check this. > > > > > > > > > > > > devm_drm_of_get_bridge is not working with legacy binding like the one > > > > > > used in sun6i dsi > > > > > > > > > > There's nothing legacy about it. > > > > > > > > What I'm mean legacy here with current binding used in sun6i-dsi like this. > > > > > > > > &dsi { > > > > vcc-dsi-supply = <®_dcdc1>; /* VCC-DSI */ > > > > status = "okay"; > > > > > > > > panel@0 { > > > > compatible = "bananapi,s070wv20-ct16-icn6211"; > > > > reg = <0>; > > > > reset-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* > > > > LCD-RST: PL5 */ > > > > enable-gpios = <&pio 1 7 GPIO_ACTIVE_HIGH>; /* > > > > LCD-PWR-EN: PB7 */ > > > > backlight = <&backlight>; > > > > }; > > > > }; > > > > > > Yes, I know, it's the generic DSI binding. It's still not legacy. > > > > > > > devm_drm_of_get_bridge cannot find the device with above binding and > > > > able to find the device with below binding. > > > > > > > > &dsi { > > > > vcc-dsi-supply = <®_dcdc1>; /* VCC-DSI */ > > > > status = "okay"; > > > > > > > > ports { > > > > #address-cells = <1>; > > > > #size-cells = <0>; > > > > > > > > dsi_out: port@0 { > > > > reg = <0>; > > > > > > > > dsi_out_bridge: endpoint { > > > > remote-endpoint = <&bridge_out_dsi>; > > > > }; > > > > }; > > > > }; > > > > > > > > panel@0 { > > > > compatible = "bananapi,s070wv20-ct16-icn6211"; > > > > reg = <0>; > > > > reset-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* LCD-RST: PL5 */ > > > > enable-gpios = <&pio 1 7 GPIO_ACTIVE_HIGH>; /* LCD-PWR-EN: PB7 */ > > > > backlight = <&backlight>; > > > > > > > > port { > > > > bridge_out_dsi: endpoint { > > > > remote-endpoint = <&dsi_out_bridge>; > > > > }; > > > > }; > > > > }; > > > > }; > > > > > > Yes, I know, and that's because ... > > > > Okay. I will use find panel and bridge separately instead of > > devm_drm_of_get_bridge in version patches. > > That's not been my point, at all? > > I mean, that whole discussion has been because you shouldn't do that. > > > > > > > > > > > > > > > https://patchwork.kernel.org/project/dri-devel/patch/20211122065223.88059-6-jagan@amarulasolutions.com/ > > > > > > > > > > > > dsi->next_bridge = devm_drm_of_get_bridge(dsi->dev, dsi->dev->of_node, 0, 0); > > > > > > if (IS_ERR(dsi->next_bridge)) > > > > > > return PTR_ERR(dsi->next_bridge); > > > > > > > > > > > > It is only working if we have ports on the pipeline, something like this > > > > > > https://patchwork.kernel.org/project/dri-devel/patch/20210214194102.126146-8-jagan@amarulasolutions.com/ > > > > > > > > > > > > Please have a look and let me know if I miss anything? > > > > > > > > > > Yes, you're missing the answer you quoted earlier: > > > > > > > > Yes, I'm trying to resolve the comment one after another. Will get back. > > > > > > ... You've ignored that comment. > > > > Not understand which comment you mean. There are few about bridge > > conversion details, I will send my comments. > > The one that got quoted there and you removed. For reference: > > > Then drm_of_find_panel_or_bridge needs to be adjusted to handle the DSI > > bindings and look for a panel or bridge not only through the OF graph, > > but also on the child nodes > > devm_drm_of_get_bridge uses drm_of_find_panel_or_bridge under the hood, > so of course it won't find it if drm_of_find_panel_or_bridge doesn't. > You need to modify drm_of_find_panel_or_bridge to also look for child > devices and see if there's a panel or bridge registered for that child > node. Then devm_drm_of_get_bridge will work as you intend it to. Got it now, I will make necessary changes. Thanks, Jagan.
Hi Jagan
@@ -1503,28 +1506,18 @@ static int samsung_dsim_panel_or_bridge(struct
samsung_dsim *dsi,
{
struct drm_bridge *panel_bridge;
struct drm_panel *panel;
- struct device_node *remote;
-
- if (of_graph_is_present(node)) {
- remote = of_graph_get_remote_node(node, DSI_PORT_OUT, 0);
- if (!remote)
- return -ENODEV;
+ int ret;
- node = remote;
- }
+ ret = drm_of_find_panel_or_bridge(dsi->dev->of_node, 1, 0, &panel,
+ &panel_bridge);
+ if (ret)
+ return ret;
- panel_bridge = of_drm_find_bridge(node);
- if (!panel_bridge) {
- panel = of_drm_find_panel(node);
- if (!IS_ERR(panel)) {
- panel_bridge = drm_panel_bridge_add(panel);
- if (IS_ERR(panel_bridge))
- return PTR_ERR(panel_bridge);
- }
+ if (panel) {
+ panel_bridge = drm_panel_bridge_add(panel);
+ if (IS_ERR(panel_bridge))
+ return PTR_ERR(panel_bridge);
}
-
- of_node_put(node);
-
dsi->out_bridge = panel_bridge;
I need to apply this change to register my panel on imx8mn even mode I
found that
@@ -1594,11 +1587,15 @@ static int samsung_dsim_host_attach(struct
mipi_dsi_host *host,
return ret;
}
- mutex_lock(&drm->mode_config.mutex);
dsi->lanes = device->lanes;
dsi->format = device->format;
dsi->mode_flags = device->mode_flags;
+
+ if (!drm)
+ return 0;
+
+ mutex_lock(&drm->mode_config.mutex);
mode_config is not initialized in this path.
Michael
On Tue, Nov 30, 2021 at 8:39 AM Jagan Teki <jagan@amarulasolutions.com> wrote:
>
> On Fri, Nov 26, 2021 at 9:34 PM Maxime Ripard <maxime@cerno.tech> wrote:
> >
> > On Thu, Nov 25, 2021 at 09:44:14PM +0530, Jagan Teki wrote:
> > > On Thu, Nov 25, 2021 at 9:40 PM Maxime Ripard <maxime@cerno.tech> wrote:
> > > >
> > > > On Thu, Nov 25, 2021 at 07:55:41PM +0530, Jagan Teki wrote:
> > > > > Hi,
> > > > >
> > > > > On Thu, Nov 25, 2021 at 7:45 PM Maxime Ripard <maxime@cerno.tech> wrote:
> > > > > >
> > > > > > On Wed, Nov 24, 2021 at 12:02:47AM +0530, Jagan Teki wrote:
> > > > > > > > > > > > + dsi->panel = of_drm_find_panel(remote);
> > > > > > > > > > > > + if (IS_ERR(dsi->panel)) {
> > > > > > > > > > > > + dsi->panel = NULL;
> > > > > > > > > > > > +
> > > > > > > > > > > > + dsi->next_bridge = of_drm_find_bridge(remote);
> > > > > > > > > > > > + if (IS_ERR(dsi->next_bridge)) {
> > > > > > > > > > > > + dev_err(dsi->dev, "failed to find bridge\n");
> > > > > > > > > > > > + return PTR_ERR(dsi->next_bridge);
> > > > > > > > > > > > + }
> > > > > > > > > > > > + } else {
> > > > > > > > > > > > + dsi->next_bridge = NULL;
> > > > > > > > > > > > + }
> > > > > > > > > > > > +
> > > > > > > > > > > > + of_node_put(remote);
> > > > > > > > > > >
> > > > > > > > > > > Using devm_drm_of_get_bridge would greatly simplify the driver
> > > > > > > > > >
> > > > > > > > > > I'm aware of this and this would break the existing sunxi dsi binding,
> > > > > > > > > > we are not using ports based pipeline in dsi node. Of-course you have
> > > > > > > > > > pointed the same before, please check below
> > > > > > > > > > https://patchwork.kernel.org/project/dri-devel/patch/20210322140152.101709-2-jagan@amarulasolutions.com/
> > > > > > > > >
> > > > > > > > > Then drm_of_find_panel_or_bridge needs to be adjusted to handle the DSI
> > > > > > > > > bindings and look for a panel or bridge not only through the OF graph,
> > > > > > > > > but also on the child nodes
> > > > > > > >
> > > > > > > > Okay. I need to check this.
> > > > > > >
> > > > > > > devm_drm_of_get_bridge is not working with legacy binding like the one
> > > > > > > used in sun6i dsi
> > > > > >
> > > > > > There's nothing legacy about it.
> > > > >
> > > > > What I'm mean legacy here with current binding used in sun6i-dsi like this.
> > > > >
> > > > > &dsi {
> > > > > vcc-dsi-supply = <®_dcdc1>; /* VCC-DSI */
> > > > > status = "okay";
> > > > >
> > > > > panel@0 {
> > > > > compatible = "bananapi,s070wv20-ct16-icn6211";
> > > > > reg = <0>;
> > > > > reset-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /*
> > > > > LCD-RST: PL5 */
> > > > > enable-gpios = <&pio 1 7 GPIO_ACTIVE_HIGH>; /*
> > > > > LCD-PWR-EN: PB7 */
> > > > > backlight = <&backlight>;
> > > > > };
> > > > > };
> > > >
> > > > Yes, I know, it's the generic DSI binding. It's still not legacy.
> > > >
> > > > > devm_drm_of_get_bridge cannot find the device with above binding and
> > > > > able to find the device with below binding.
> > > > >
> > > > > &dsi {
> > > > > vcc-dsi-supply = <®_dcdc1>; /* VCC-DSI */
> > > > > status = "okay";
> > > > >
> > > > > ports {
> > > > > #address-cells = <1>;
> > > > > #size-cells = <0>;
> > > > >
> > > > > dsi_out: port@0 {
> > > > > reg = <0>;
> > > > >
> > > > > dsi_out_bridge: endpoint {
> > > > > remote-endpoint = <&bridge_out_dsi>;
> > > > > };
> > > > > };
> > > > > };
> > > > >
> > > > > panel@0 {
> > > > > compatible = "bananapi,s070wv20-ct16-icn6211";
> > > > > reg = <0>;
> > > > > reset-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* LCD-RST: PL5 */
> > > > > enable-gpios = <&pio 1 7 GPIO_ACTIVE_HIGH>; /* LCD-PWR-EN: PB7 */
> > > > > backlight = <&backlight>;
> > > > >
> > > > > port {
> > > > > bridge_out_dsi: endpoint {
> > > > > remote-endpoint = <&dsi_out_bridge>;
> > > > > };
> > > > > };
> > > > > };
> > > > > };
> > > >
> > > > Yes, I know, and that's because ...
> > >
> > > Okay. I will use find panel and bridge separately instead of
> > > devm_drm_of_get_bridge in version patches.
> >
> > That's not been my point, at all?
> >
> > I mean, that whole discussion has been because you shouldn't do that.
> >
> > > >
> > > > > >
> > > > > > > https://patchwork.kernel.org/project/dri-devel/patch/20211122065223.88059-6-jagan@amarulasolutions.com/
> > > > > > >
> > > > > > > dsi->next_bridge = devm_drm_of_get_bridge(dsi->dev, dsi->dev->of_node, 0, 0);
> > > > > > > if (IS_ERR(dsi->next_bridge))
> > > > > > > return PTR_ERR(dsi->next_bridge);
> > > > > > >
> > > > > > > It is only working if we have ports on the pipeline, something like this
> > > > > > > https://patchwork.kernel.org/project/dri-devel/patch/20210214194102.126146-8-jagan@amarulasolutions.com/
> > > > > > >
> > > > > > > Please have a look and let me know if I miss anything?
> > > > > >
> > > > > > Yes, you're missing the answer you quoted earlier:
> > > > >
> > > > > Yes, I'm trying to resolve the comment one after another. Will get back.
> > > >
> > > > ... You've ignored that comment.
> > >
> > > Not understand which comment you mean. There are few about bridge
> > > conversion details, I will send my comments.
> >
> > The one that got quoted there and you removed. For reference:
> >
> > > Then drm_of_find_panel_or_bridge needs to be adjusted to handle the DSI
> > > bindings and look for a panel or bridge not only through the OF graph,
> > > but also on the child nodes
> >
> > devm_drm_of_get_bridge uses drm_of_find_panel_or_bridge under the hood,
> > so of course it won't find it if drm_of_find_panel_or_bridge doesn't.
> > You need to modify drm_of_find_panel_or_bridge to also look for child
> > devices and see if there's a panel or bridge registered for that child
> > node. Then devm_drm_of_get_bridge will work as you intend it to.
>
> Got it now, I will make necessary changes.
>
> Thanks,
> Jagan.
>
>
diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c index 43d9c9e5198d..a6a272b55f77 100644 --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c @@ -21,6 +21,7 @@ #include <drm/drm_atomic_helper.h> #include <drm/drm_mipi_dsi.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <drm/drm_print.h> #include <drm/drm_probe_helper.h> @@ -713,10 +714,11 @@ static int sun6i_dsi_start(struct sun6i_dsi *dsi, return 0; } -static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) +static void sun6i_dsi_bridge_atomic_enable(struct drm_bridge *bridge, + struct drm_bridge_state *old_bridge_state) { - struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); + struct drm_display_mode *mode = &bridge->encoder->crtc->state->adjusted_mode; struct mipi_dsi_device *device = dsi->device; union phy_configure_opts opts = { }; struct phy_configure_opts_mipi_dphy *cfg = &opts.mipi_dphy; @@ -772,6 +774,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) if (dsi->panel) drm_panel_prepare(dsi->panel); + if (dsi->next_bridge) + dsi->next_bridge->funcs->atomic_pre_enable(dsi->next_bridge, old_bridge_state); + /* * FIXME: This should be moved after the switch to HS mode. * @@ -787,6 +792,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) if (dsi->panel) drm_panel_enable(dsi->panel); + if (dsi->next_bridge) + dsi->next_bridge->funcs->atomic_enable(dsi->next_bridge, old_bridge_state); + sun6i_dsi_start(dsi, DSI_START_HSC); udelay(1000); @@ -794,15 +802,19 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) sun6i_dsi_start(dsi, DSI_START_HSD); } -static void sun6i_dsi_encoder_disable(struct drm_encoder *encoder) +static void sun6i_dsi_bridge_atomic_disable(struct drm_bridge *bridge, + struct drm_bridge_state *old_bridge_state) { - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); DRM_DEBUG_DRIVER("Disabling DSI output\n"); if (dsi->panel) { drm_panel_disable(dsi->panel); drm_panel_unprepare(dsi->panel); + } else if (dsi->next_bridge) { + dsi->next_bridge->funcs->atomic_disable(dsi->next_bridge, old_bridge_state); + dsi->next_bridge->funcs->atomic_post_disable(dsi->next_bridge, old_bridge_state); } phy_power_off(dsi->dphy); @@ -842,9 +854,25 @@ static const struct drm_connector_funcs sun6i_dsi_connector_funcs = { .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, }; -static const struct drm_encoder_helper_funcs sun6i_dsi_enc_helper_funcs = { - .disable = sun6i_dsi_encoder_disable, - .enable = sun6i_dsi_encoder_enable, +static int sun6i_dsi_bridge_attach(struct drm_bridge *bridge, + enum drm_bridge_attach_flags flags) +{ + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); + + if (dsi->next_bridge) + return drm_bridge_attach(bridge->encoder, dsi->next_bridge, + NULL, 0); + + return 0; +} + +static const struct drm_bridge_funcs sun6i_dsi_bridge_funcs = { + .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_enable = sun6i_dsi_bridge_atomic_enable, + .atomic_disable = sun6i_dsi_bridge_atomic_disable, + .attach = sun6i_dsi_bridge_attach, }; static u32 sun6i_dsi_dcs_build_pkt_hdr(struct sun6i_dsi *dsi, @@ -966,8 +994,6 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, struct sun6i_dsi *dsi = dev_get_drvdata(dev); int ret; - drm_encoder_helper_add(&dsi->encoder, - &sun6i_dsi_enc_helper_funcs); ret = drm_simple_encoder_init(drm, &dsi->encoder, DRM_MODE_ENCODER_DSI); if (ret) { @@ -976,18 +1002,26 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, } dsi->encoder.possible_crtcs = BIT(0); - drm_connector_helper_add(&dsi->connector, - &sun6i_dsi_connector_helper_funcs); - ret = drm_connector_init(drm, &dsi->connector, - &sun6i_dsi_connector_funcs, - DRM_MODE_CONNECTOR_DSI); + ret = drm_bridge_attach(&dsi->encoder, &dsi->bridge, NULL, 0); if (ret) { - dev_err(dsi->dev, - "Couldn't initialise the DSI connector\n"); + dev_err(dsi->dev, "Couldn't attach drm bridge\n"); goto err_cleanup_connector; } - drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); + if (dsi->panel) { + drm_connector_helper_add(&dsi->connector, + &sun6i_dsi_connector_helper_funcs); + ret = drm_connector_init(drm, &dsi->connector, + &sun6i_dsi_connector_funcs, + DRM_MODE_CONNECTOR_DSI); + if (ret) { + dev_err(dsi->dev, + "Couldn't initialise the DSI connector\n"); + goto err_cleanup_connector; + } + + drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); + } return 0; @@ -1013,16 +1047,46 @@ static int sun6i_dsi_attach(struct mipi_dsi_host *host, struct mipi_dsi_device *device) { struct sun6i_dsi *dsi = host_to_sun6i_dsi(host); - struct drm_panel *panel = of_drm_find_panel(device->dev.of_node); + struct device_node *remote = device->dev.of_node; int ret; - if (IS_ERR(panel)) - return PTR_ERR(panel); + if (!of_device_is_available(remote)) { + /** + * I2C interfaced DSI bridges will register DSI host on the + * bridge drivers instead of conventional device. + * + * Those are probed via host of_node instead of device of_node. + */ + remote = of_graph_get_remote_node(host->dev->of_node, 0, 0); + if (!remote) + return -ENODEV; + } + + dsi->panel = of_drm_find_panel(remote); + if (IS_ERR(dsi->panel)) { + dsi->panel = NULL; + + dsi->next_bridge = of_drm_find_bridge(remote); + if (IS_ERR(dsi->next_bridge)) { + dev_err(dsi->dev, "failed to find bridge\n"); + return PTR_ERR(dsi->next_bridge); + } + } else { + dsi->next_bridge = NULL; + } + + of_node_put(remote); - dsi->panel = panel; dsi->device = device; - dev_info(host->dev, "Attached device %s\n", device->name); + dev_info(host->dev, "Attached %s %s\n", + device->name, dsi->panel ? "panel" : "bridge"); + + dsi->bridge.funcs = &sun6i_dsi_bridge_funcs; + dsi->bridge.of_node = dsi->dev->of_node; + dsi->bridge.type = DRM_MODE_CONNECTOR_DSI; + + drm_bridge_add(&dsi->bridge); ret = component_add(dsi->dev, &sun6i_dsi_ops); if (ret) { @@ -1040,9 +1104,11 @@ static int sun6i_dsi_detach(struct mipi_dsi_host *host, struct sun6i_dsi *dsi = host_to_sun6i_dsi(host); dsi->panel = NULL; + dsi->next_bridge = NULL; dsi->device = NULL; component_del(dsi->dev, &sun6i_dsi_ops); + drm_bridge_remove(&dsi->bridge); return 0; } diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h index 61e88ea6044d..d269304691c9 100644 --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h @@ -16,6 +16,7 @@ #define SUN6I_DSI_TCON_DIV 4 struct sun6i_dsi { + struct drm_bridge bridge; struct drm_connector connector; struct drm_encoder encoder; struct mipi_dsi_host host; @@ -30,6 +31,7 @@ struct sun6i_dsi { struct device *dev; struct mipi_dsi_device *device; struct drm_panel *panel; + struct drm_bridge *next_bridge; }; static inline struct sun6i_dsi *host_to_sun6i_dsi(struct mipi_dsi_host *host) @@ -37,6 +39,11 @@ static inline struct sun6i_dsi *host_to_sun6i_dsi(struct mipi_dsi_host *host) return container_of(host, struct sun6i_dsi, host); }; +static inline struct sun6i_dsi *bridge_to_sun6i_dsi(struct drm_bridge *bridge) +{ + return container_of(bridge, struct sun6i_dsi, bridge); +} + static inline struct sun6i_dsi *connector_to_sun6i_dsi(struct drm_connector *connector) { return container_of(connector, struct sun6i_dsi, connector);
Some display panels would come up with a non-DSI output, those can have an option to connect the DSI host by means of interface bridge converter. This DSI to non-DSI interface bridge converter would requires DSI Host to handle drm bridge functionalities in order to DSI Host to Interface bridge. This patch convert the existing to a drm bridge driver with a built-in encoder support for compatibility with existing component drivers. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- Changes for v5: - add atomic APIs - find host and device variant DSI devices. Changes for v4, v3: - none drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 112 ++++++++++++++++++++----- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 7 ++ 2 files changed, 96 insertions(+), 23 deletions(-)