| Message ID | 2759075c94c011b0f15cb610f39f8fa9b3736600.1687423204.git.geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: renesas: shmobile: Atomic conversion + DT support | expand |
Hi Geert, Thank you for the patch. On Thu, Jun 22, 2023 at 11:21:51AM +0200, Geert Uytterhoeven wrote: > Add DT support, by: > 1. Creating a panel bridge from DT, and attaching it to the encoder, > 2. Replacing the custom connector with a bridge connector, > 3. Obtaining clock configuration based on the compatible value. > > Note that for now the driver uses a fixed clock configuration selecting > the bus clock, as the current code to select other clock inputs needs > changes to support any other SoCs than SH7724. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> > Cc: Conor Dooley <conor+dt@kernel.org> > Cc: devicetree@vger.kernel.org > --- > SH-Mobile AG5 (SH73A0) support is untested. > > Unbind crashes when drm_encoder_cleanup() calls drm_bridge_detach(), as > the bridge (allocated by devm_drm_panel_bridge_add()) has already been > freed by that time. > Should I allocate my encoder with devm_kzalloc(), instead of embedding > it inside struct shmob_drm_device? That shouldn't be needed, if you manage the memory for shmob_drm_device with the DRM managed helpers. Lifetime management of bridges is currently completely broken, there's nothing that prevents bridges from being freed while still in use. That's an issue in DRM, not in your driver. > --- > .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 101 +++++++++++++++--- > .../gpu/drm/renesas/shmobile/shmob_drm_crtc.h | 1 + > .../gpu/drm/renesas/shmobile/shmob_drm_drv.c | 27 ++++- > .../gpu/drm/renesas/shmobile/shmob_drm_drv.h | 6 ++ > 4 files changed, 118 insertions(+), 17 deletions(-) > > diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c > index 17456dde57637ab8..1ec87841658de4f0 100644 > --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c > +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c > @@ -9,12 +9,16 @@ > > #include <linux/clk.h> > #include <linux/media-bus-format.h> > +#include <linux/of.h> > +#include <linux/of_graph.h> > #include <linux/pm_runtime.h> > > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > #include <drm/drm_atomic_state_helper.h> > #include <drm/drm_atomic_uapi.h> > +#include <drm/drm_bridge.h> > +#include <drm/drm_bridge_connector.h> > #include <drm/drm_crtc.h> > #include <drm/drm_crtc_helper.h> > #include <drm/drm_fb_dma_helper.h> > @@ -23,6 +27,7 @@ > #include <drm/drm_gem_dma_helper.h> > #include <drm/drm_modeset_helper.h> > #include <drm/drm_modeset_helper_vtables.h> > +#include <drm/drm_panel.h> > #include <drm/drm_probe_helper.h> > #include <drm/drm_simple_kms_helper.h> > #include <drm/drm_vblank.h> > @@ -35,10 +40,6 @@ > #include "shmob_drm_plane.h" > #include "shmob_drm_regs.h" > > -/* > - * TODO: panel support > - */ > - > /* ----------------------------------------------------------------------------- > * Clock management > */ > @@ -129,7 +130,6 @@ static void shmob_drm_crtc_setup_geometry(struct shmob_drm_crtc *scrtc) > value |= LDMT1R_VPOL; > if (mode->flags & DRM_MODE_FLAG_NHSYNC) > value |= LDMT1R_HPOL; > - This could be moved to one of the patches in the series that touch this code. > lcdc_write(sdev, LDMT1R, value); > > value = ((mode->hdisplay / 8) << 16) /* HDCN */ > @@ -191,7 +191,7 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc) > { > struct drm_crtc *crtc = &scrtc->base; > struct shmob_drm_device *sdev = to_shmob_device(crtc->dev); > - const struct shmob_drm_interface_data *idata = &sdev->pdata->iface; > + unsigned int clk_div = sdev->config.clk_div; > struct device *dev = sdev->dev; > u32 value; > int ret; > @@ -220,17 +220,17 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc) > lcdc_write(sdev, LDPMR, 0); > > value = sdev->lddckr; > - if (idata->clk_div) { > + if (clk_div) { > /* FIXME: sh7724 can only use 42, 48, 54 and 60 for the divider > * denominator. > */ > lcdc_write(sdev, LDDCKPAT1R, 0); > - lcdc_write(sdev, LDDCKPAT2R, (1 << (idata->clk_div / 2)) - 1); > + lcdc_write(sdev, LDDCKPAT2R, (1 << (clk_div / 2)) - 1); > > - if (idata->clk_div == 1) > + if (clk_div == 1) > value |= LDDCKR_MOSEL; > else > - value |= idata->clk_div; > + value |= clk_div; > } > > lcdc_write(sdev, LDDCKR, value); > @@ -479,7 +479,7 @@ int shmob_drm_crtc_create(struct shmob_drm_device *sdev) > } > > /* ----------------------------------------------------------------------------- > - * Encoder > + * Legacy Encoder > */ > > static bool shmob_drm_encoder_mode_fixup(struct drm_encoder *encoder, > @@ -508,9 +508,43 @@ static const struct drm_encoder_helper_funcs encoder_helper_funcs = { > .mode_fixup = shmob_drm_encoder_mode_fixup, > }; > > +/* ----------------------------------------------------------------------------- > + * Encoder > + */ > + > +static int shmob_drm_encoder_init(struct shmob_drm_device *sdev, > + struct device_node *enc_node) > +{ > + struct drm_bridge *bridge; > + struct drm_panel *panel; > + int ret; > + > + /* Create a panel bridge */ > + panel = of_drm_find_panel(enc_node); Using drm_of_find_panel_or_bridge() would allow supporting platforms that connect a non-panel device to the SoC, in additional to the already supported panels. > + if (IS_ERR(panel)) > + return PTR_ERR(panel); > + > + bridge = devm_drm_panel_bridge_add(sdev->dev, panel); > + if (IS_ERR(bridge)) > + return PTR_ERR(bridge); > + > + /* Attach the bridge to the encoder */ > + ret = drm_bridge_attach(&sdev->encoder, bridge, NULL, > + DRM_BRIDGE_ATTACH_NO_CONNECTOR); > + if (ret) { > + dev_err(sdev->dev, "failed to attach bridge %pOF: %pe\n", > + bridge->of_node, ERR_PTR(ret)); > + return ret; > + } > + > + return 0; > +} > + > int shmob_drm_encoder_create(struct shmob_drm_device *sdev) > { > struct drm_encoder *encoder = &sdev->encoder; > + struct device_node *np = sdev->dev->of_node; > + struct device_node *ep_node, *entity; > int ret; > > encoder->possible_crtcs = 1; > @@ -520,13 +554,45 @@ int shmob_drm_encoder_create(struct shmob_drm_device *sdev) > if (ret < 0) > return ret; > > - drm_encoder_helper_add(encoder, &encoder_helper_funcs); > + if (sdev->pdata) { > + drm_encoder_helper_add(encoder, &encoder_helper_funcs); > + return 0; > + } > + > + for_each_endpoint_of_node(np, ep_node) { > + struct of_endpoint ep; > + > + ret = of_graph_parse_endpoint(ep_node, &ep); > + if (ret < 0) { > + of_node_put(ep_node); > + return ret; > + } > + /* Ignore all but the LCD port */ > + if (ep.port || ep.id) > + continue; > + > + entity = of_graph_get_remote_port_parent(ep.local_node); > + if (!entity) > + continue; > + > + if (!of_device_is_available(entity)) { > + of_node_put(entity); > + continue; > + } > + > + ret = shmob_drm_encoder_init(sdev, entity); > + if (ret < 0) { > + of_node_put(entity); > + of_node_put(ep_node); > + return ret; > + } > + } > > return 0; > } > > /* ----------------------------------------------------------------------------- > - * Connector > + * Legacy Connector > */ > > static inline struct shmob_drm_connector *to_shmob_connector(struct drm_connector *connector) > @@ -626,13 +692,20 @@ shmob_drm_connector_init(struct shmob_drm_device *sdev, > return connector; > } > > +/* ----------------------------------------------------------------------------- > + * Connector > + */ > + > int shmob_drm_connector_create(struct shmob_drm_device *sdev, > struct drm_encoder *encoder) > { > struct drm_connector *connector; > int ret; > > - connector = shmob_drm_connector_init(sdev, encoder); > + if (sdev->pdata) > + connector = shmob_drm_connector_init(sdev, encoder); > + else > + connector = drm_bridge_connector_init(&sdev->ddev, encoder); > if (IS_ERR(connector)) { > dev_err(sdev->dev, "failed to created connector: %pe\n", > connector); > diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h > index 89a0746f9a35807d..16e1712dd04e0f2b 100644 > --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h > +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h > @@ -29,6 +29,7 @@ struct shmob_drm_crtc { > wait_queue_head_t flip_wait; > }; > > +/* Legacy connector */ > struct shmob_drm_connector { > struct drm_connector base; > struct drm_encoder *encoder; > diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c > index 576869164479ec6b..db72ca1c8b2f44c9 100644 > --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c > +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c > @@ -11,6 +11,7 @@ > #include <linux/io.h> > #include <linux/mm.h> > #include <linux/module.h> > +#include <linux/of.h> > #include <linux/platform_device.h> > #include <linux/pm.h> > #include <linux/pm_runtime.h> > @@ -147,11 +148,13 @@ static int shmob_drm_remove(struct platform_device *pdev) > static int shmob_drm_probe(struct platform_device *pdev) > { > struct shmob_drm_platform_data *pdata = pdev->dev.platform_data; How about dropping non-DT support ? That would simplify the driver. > + const struct shmob_drm_config *config; > struct shmob_drm_device *sdev; > struct drm_device *ddev; > int ret; > > - if (pdata == NULL) { > + config = of_device_get_match_data(&pdev->dev); > + if (!config && !pdata) { > dev_err(&pdev->dev, "no platform data\n"); > return -EINVAL; > } > @@ -167,7 +170,13 @@ static int shmob_drm_probe(struct platform_device *pdev) > > ddev = &sdev->ddev; > sdev->dev = &pdev->dev; > - sdev->pdata = pdata; > + if (config) { > + sdev->config = *config; > + } else { > + sdev->pdata = pdata; > + sdev->config.clk_source = pdata->clk_source; > + sdev->config.clk_div = pdata->iface.clk_div; > + } > spin_lock_init(&sdev->irq_lock); > > platform_set_drvdata(pdev, sdev); > @@ -180,7 +189,7 @@ static int shmob_drm_probe(struct platform_device *pdev) > if (ret) > return ret; > > - ret = shmob_drm_setup_clocks(sdev, pdata->clk_source); > + ret = shmob_drm_setup_clocks(sdev, sdev->config.clk_source); > if (ret < 0) > return ret; > > @@ -224,11 +233,23 @@ static int shmob_drm_probe(struct platform_device *pdev) > return ret; > } > > +static const struct shmob_drm_config shmob_arm_config = { > + .clk_source = SHMOB_DRM_CLK_BUS, > + .clk_div = 5, > +}; > + > +static const struct of_device_id shmob_drm_of_table[] __maybe_unused = { > + { .compatible = "renesas,r8a7740-lcdc", .data = &shmob_arm_config, }, > + { .compatible = "renesas,sh73a0-lcdc", .data = &shmob_arm_config, }, > + { /* sentinel */ } > +}; > + > static struct platform_driver shmob_drm_platform_driver = { > .probe = shmob_drm_probe, > .remove = shmob_drm_remove, > .driver = { > .name = "shmob-drm", > + .of_match_table = of_match_ptr(shmob_drm_of_table), > .pm = pm_sleep_ptr(&shmob_drm_pm_ops), > }, > }; > diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h > index 18907e5ace51c681..088ac5381e91e61a 100644 > --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h > +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h > @@ -20,9 +20,15 @@ struct clk; > struct device; > struct drm_device; > > +struct shmob_drm_config { > + enum shmob_drm_clk_source clk_source; > + unsigned int clk_div; > +}; > + > struct shmob_drm_device { > struct device *dev; > const struct shmob_drm_platform_data *pdata; > + struct shmob_drm_config config; > > void __iomem *mmio; > struct clk *clock;
On Fri, Jun 23, 2023 at 08:50:19PM +0300, Laurent Pinchart wrote: > Hi Geert, > > Thank you for the patch. > > On Thu, Jun 22, 2023 at 11:21:51AM +0200, Geert Uytterhoeven wrote: > > Add DT support, by: > > 1. Creating a panel bridge from DT, and attaching it to the encoder, > > 2. Replacing the custom connector with a bridge connector, > > 3. Obtaining clock configuration based on the compatible value. > > > > Note that for now the driver uses a fixed clock configuration selecting > > the bus clock, as the current code to select other clock inputs needs > > changes to support any other SoCs than SH7724. > > > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > > Cc: Rob Herring <robh+dt@kernel.org> > > Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> > > Cc: Conor Dooley <conor+dt@kernel.org> > > Cc: devicetree@vger.kernel.org > > --- > > SH-Mobile AG5 (SH73A0) support is untested. > > > > Unbind crashes when drm_encoder_cleanup() calls drm_bridge_detach(), as > > the bridge (allocated by devm_drm_panel_bridge_add()) has already been > > freed by that time. > > Should I allocate my encoder with devm_kzalloc(), instead of embedding > > it inside struct shmob_drm_device? > > That shouldn't be needed, if you manage the memory for shmob_drm_device > with the DRM managed helpers. > > Lifetime management of bridges is currently completely broken, there's > nothing that prevents bridges from being freed while still in use. > That's an issue in DRM, not in your driver. > > > --- > > .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 101 +++++++++++++++--- > > .../gpu/drm/renesas/shmobile/shmob_drm_crtc.h | 1 + > > .../gpu/drm/renesas/shmobile/shmob_drm_drv.c | 27 ++++- > > .../gpu/drm/renesas/shmobile/shmob_drm_drv.h | 6 ++ > > 4 files changed, 118 insertions(+), 17 deletions(-) > > > > diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c > > index 17456dde57637ab8..1ec87841658de4f0 100644 > > --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c > > +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c > > @@ -9,12 +9,16 @@ > > > > #include <linux/clk.h> > > #include <linux/media-bus-format.h> > > +#include <linux/of.h> > > +#include <linux/of_graph.h> > > #include <linux/pm_runtime.h> > > > > #include <drm/drm_atomic.h> > > #include <drm/drm_atomic_helper.h> > > #include <drm/drm_atomic_state_helper.h> > > #include <drm/drm_atomic_uapi.h> > > +#include <drm/drm_bridge.h> > > +#include <drm/drm_bridge_connector.h> > > #include <drm/drm_crtc.h> > > #include <drm/drm_crtc_helper.h> > > #include <drm/drm_fb_dma_helper.h> > > @@ -23,6 +27,7 @@ > > #include <drm/drm_gem_dma_helper.h> > > #include <drm/drm_modeset_helper.h> > > #include <drm/drm_modeset_helper_vtables.h> > > +#include <drm/drm_panel.h> > > #include <drm/drm_probe_helper.h> > > #include <drm/drm_simple_kms_helper.h> > > #include <drm/drm_vblank.h> > > @@ -35,10 +40,6 @@ > > #include "shmob_drm_plane.h" > > #include "shmob_drm_regs.h" > > > > -/* > > - * TODO: panel support > > - */ > > - > > /* ----------------------------------------------------------------------------- > > * Clock management > > */ > > @@ -129,7 +130,6 @@ static void shmob_drm_crtc_setup_geometry(struct shmob_drm_crtc *scrtc) > > value |= LDMT1R_VPOL; > > if (mode->flags & DRM_MODE_FLAG_NHSYNC) > > value |= LDMT1R_HPOL; > > - > > This could be moved to one of the patches in the series that touch this > code. > > > lcdc_write(sdev, LDMT1R, value); > > > > value = ((mode->hdisplay / 8) << 16) /* HDCN */ > > @@ -191,7 +191,7 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc) > > { > > struct drm_crtc *crtc = &scrtc->base; > > struct shmob_drm_device *sdev = to_shmob_device(crtc->dev); > > - const struct shmob_drm_interface_data *idata = &sdev->pdata->iface; > > + unsigned int clk_div = sdev->config.clk_div; > > struct device *dev = sdev->dev; > > u32 value; > > int ret; > > @@ -220,17 +220,17 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc) > > lcdc_write(sdev, LDPMR, 0); > > > > value = sdev->lddckr; > > - if (idata->clk_div) { > > + if (clk_div) { > > /* FIXME: sh7724 can only use 42, 48, 54 and 60 for the divider > > * denominator. > > */ > > lcdc_write(sdev, LDDCKPAT1R, 0); > > - lcdc_write(sdev, LDDCKPAT2R, (1 << (idata->clk_div / 2)) - 1); > > + lcdc_write(sdev, LDDCKPAT2R, (1 << (clk_div / 2)) - 1); > > > > - if (idata->clk_div == 1) > > + if (clk_div == 1) > > value |= LDDCKR_MOSEL; > > else > > - value |= idata->clk_div; > > + value |= clk_div; > > } > > > > lcdc_write(sdev, LDDCKR, value); > > @@ -479,7 +479,7 @@ int shmob_drm_crtc_create(struct shmob_drm_device *sdev) > > } > > > > /* ----------------------------------------------------------------------------- > > - * Encoder > > + * Legacy Encoder > > */ > > > > static bool shmob_drm_encoder_mode_fixup(struct drm_encoder *encoder, > > @@ -508,9 +508,43 @@ static const struct drm_encoder_helper_funcs encoder_helper_funcs = { > > .mode_fixup = shmob_drm_encoder_mode_fixup, > > }; > > > > +/* ----------------------------------------------------------------------------- > > + * Encoder > > + */ > > + > > +static int shmob_drm_encoder_init(struct shmob_drm_device *sdev, > > + struct device_node *enc_node) > > +{ > > + struct drm_bridge *bridge; > > + struct drm_panel *panel; > > + int ret; > > + > > + /* Create a panel bridge */ > > + panel = of_drm_find_panel(enc_node); > > Using drm_of_find_panel_or_bridge() would allow supporting platforms > that connect a non-panel device to the SoC, in additional to the already > supported panels. From the documentation of drm_of_find_panel_or_bridge(): * This function is deprecated and should not be used in new drivers. Use * devm_drm_of_get_bridge() instead. I suggest to go that route. > > @@ -147,11 +148,13 @@ static int shmob_drm_remove(struct platform_device *pdev) > > static int shmob_drm_probe(struct platform_device *pdev) > > { > > struct shmob_drm_platform_data *pdata = pdev->dev.platform_data; > > How about dropping non-DT support ? That would simplify the driver. +1 for that, without knowing the implications. Sam
Hi Sam, Laurent, On Fri, Jun 23, 2023 at 7:54 PM Sam Ravnborg <sam@ravnborg.org> wrote: > On Fri, Jun 23, 2023 at 08:50:19PM +0300, Laurent Pinchart wrote: > > On Thu, Jun 22, 2023 at 11:21:51AM +0200, Geert Uytterhoeven wrote: > > > Add DT support, by: > > > 1. Creating a panel bridge from DT, and attaching it to the encoder, > > > 2. Replacing the custom connector with a bridge connector, > > > 3. Obtaining clock configuration based on the compatible value. > > > > > > Note that for now the driver uses a fixed clock configuration selecting > > > the bus clock, as the current code to select other clock inputs needs > > > changes to support any other SoCs than SH7724. > > > > > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > > > Cc: Rob Herring <robh+dt@kernel.org> > > > Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> > > > Cc: Conor Dooley <conor+dt@kernel.org> > > > Cc: devicetree@vger.kernel.org > > > --- > > > SH-Mobile AG5 (SH73A0) support is untested. > > > > > > Unbind crashes when drm_encoder_cleanup() calls drm_bridge_detach(), as > > > the bridge (allocated by devm_drm_panel_bridge_add()) has already been > > > freed by that time. > > > Should I allocate my encoder with devm_kzalloc(), instead of embedding > > > it inside struct shmob_drm_device? > > > > That shouldn't be needed, if you manage the memory for shmob_drm_device > > with the DRM managed helpers. Well, Marek said unbind works fine in drivers/gpu/drm/mxsfb/lcdif_drv.c, where the order is: bridge = devm_drm_of_get_bridge(...) encoder = devm_kzalloc(...) drm_encoder_init(...) > > Lifetime management of bridges is currently completely broken, there's > > nothing that prevents bridges from being freed while still in use. > > That's an issue in DRM, not in your driver. OK ;-) (or :-( > > > --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c > > > +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c > > > @@ -508,9 +508,43 @@ static const struct drm_encoder_helper_funcs encoder_helper_funcs = { > > > .mode_fixup = shmob_drm_encoder_mode_fixup, > > > }; > > > > > > +/* ----------------------------------------------------------------------------- > > > + * Encoder > > > + */ > > > + > > > +static int shmob_drm_encoder_init(struct shmob_drm_device *sdev, > > > + struct device_node *enc_node) > > > +{ > > > + struct drm_bridge *bridge; > > > + struct drm_panel *panel; > > > + int ret; > > > + > > > + /* Create a panel bridge */ > > > + panel = of_drm_find_panel(enc_node); > > > > Using drm_of_find_panel_or_bridge() would allow supporting platforms > > that connect a non-panel device to the SoC, in additional to the already > > supported panels. > > From the documentation of drm_of_find_panel_or_bridge(): > > * This function is deprecated and should not be used in new drivers. Use > * devm_drm_of_get_bridge() instead. > > I suggest to go that route. OK (do I have the feeling that these helpers are sometimes deprecated faster than they are written? ;-) > > > @@ -147,11 +148,13 @@ static int shmob_drm_remove(struct platform_device *pdev) > > > static int shmob_drm_probe(struct platform_device *pdev) > > > { > > > struct shmob_drm_platform_data *pdata = pdev->dev.platform_data; > > > > How about dropping non-DT support ? That would simplify the driver. > > +1 for that, without knowing the implications. That depends on your priorities: do you want to migrate all users of sh_mobile_lcdc_fb to shmob_drm, or do you want the SuperH users to stick with sh_mobile_lcdc_fb until they have migrated to DT? ;-) Regardless of the above, I do not have (visible) access to any of the affected SH772[234] platforms... Gr{oetje,eeting}s, Geert
On Fri, Jun 23, 2023 at 08:09:53PM +0200, Geert Uytterhoeven wrote: > On Fri, Jun 23, 2023 at 7:54 PM Sam Ravnborg <sam@ravnborg.org> wrote: > > On Fri, Jun 23, 2023 at 08:50:19PM +0300, Laurent Pinchart wrote: > > > On Thu, Jun 22, 2023 at 11:21:51AM +0200, Geert Uytterhoeven wrote: > > > > Add DT support, by: > > > > 1. Creating a panel bridge from DT, and attaching it to the encoder, > > > > 2. Replacing the custom connector with a bridge connector, > > > > 3. Obtaining clock configuration based on the compatible value. > > > > > > > > Note that for now the driver uses a fixed clock configuration selecting > > > > the bus clock, as the current code to select other clock inputs needs > > > > changes to support any other SoCs than SH7724. > > > > > > > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > > > > Cc: Rob Herring <robh+dt@kernel.org> > > > > Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> > > > > Cc: Conor Dooley <conor+dt@kernel.org> > > > > Cc: devicetree@vger.kernel.org > > > > --- > > > > SH-Mobile AG5 (SH73A0) support is untested. > > > > > > > > Unbind crashes when drm_encoder_cleanup() calls drm_bridge_detach(), as > > > > the bridge (allocated by devm_drm_panel_bridge_add()) has already been > > > > freed by that time. > > > > Should I allocate my encoder with devm_kzalloc(), instead of embedding > > > > it inside struct shmob_drm_device? > > > > > > That shouldn't be needed, if you manage the memory for shmob_drm_device > > > with the DRM managed helpers. > > Well, Marek said unbind works fine in drivers/gpu/drm/mxsfb/lcdif_drv.c, > where the order is: > > bridge = devm_drm_of_get_bridge(...) > encoder = devm_kzalloc(...) > drm_encoder_init(...) > > > > Lifetime management of bridges is currently completely broken, there's > > > nothing that prevents bridges from being freed while still in use. > > > That's an issue in DRM, not in your driver. > > OK ;-) (or :-( > > > > > --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c > > > > +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c > > > > @@ -508,9 +508,43 @@ static const struct drm_encoder_helper_funcs encoder_helper_funcs = { > > > > .mode_fixup = shmob_drm_encoder_mode_fixup, > > > > }; > > > > > > > > +/* ----------------------------------------------------------------------------- > > > > + * Encoder > > > > + */ > > > > + > > > > +static int shmob_drm_encoder_init(struct shmob_drm_device *sdev, > > > > + struct device_node *enc_node) > > > > +{ > > > > + struct drm_bridge *bridge; > > > > + struct drm_panel *panel; > > > > + int ret; > > > > + > > > > + /* Create a panel bridge */ > > > > + panel = of_drm_find_panel(enc_node); > > > > > > Using drm_of_find_panel_or_bridge() would allow supporting platforms > > > that connect a non-panel device to the SoC, in additional to the already > > > supported panels. > > > > From the documentation of drm_of_find_panel_or_bridge(): > > > > * This function is deprecated and should not be used in new drivers. Use > > * devm_drm_of_get_bridge() instead. Indeed, my bad/ devm_drm_of_get_bridge() is better. > > I suggest to go that route. > > OK (do I have the feeling that these helpers are sometimes deprecated > faster than they are written? ;-) > > > > > @@ -147,11 +148,13 @@ static int shmob_drm_remove(struct platform_device *pdev) > > > > static int shmob_drm_probe(struct platform_device *pdev) > > > > { > > > > struct shmob_drm_platform_data *pdata = pdev->dev.platform_data; > > > > > > How about dropping non-DT support ? That would simplify the driver. > > > > +1 for that, without knowing the implications. > > That depends on your priorities: do you want to migrate all users of > sh_mobile_lcdc_fb to shmob_drm, or do you want the SuperH users to > stick with sh_mobile_lcdc_fb until they have migrated to DT? ;-) I'd vote for dropping LCDC support from the SH users. Does anyone *really* need it ? If they do, they should convert the board to DT. > Regardless of the above, I do not have (visible) access to any of the > affected SH772[234] platforms...
diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c index 17456dde57637ab8..1ec87841658de4f0 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c @@ -9,12 +9,16 @@ #include <linux/clk.h> #include <linux/media-bus-format.h> +#include <linux/of.h> +#include <linux/of_graph.h> #include <linux/pm_runtime.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_state_helper.h> #include <drm/drm_atomic_uapi.h> +#include <drm/drm_bridge.h> +#include <drm/drm_bridge_connector.h> #include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_fb_dma_helper.h> @@ -23,6 +27,7 @@ #include <drm/drm_gem_dma_helper.h> #include <drm/drm_modeset_helper.h> #include <drm/drm_modeset_helper_vtables.h> +#include <drm/drm_panel.h> #include <drm/drm_probe_helper.h> #include <drm/drm_simple_kms_helper.h> #include <drm/drm_vblank.h> @@ -35,10 +40,6 @@ #include "shmob_drm_plane.h" #include "shmob_drm_regs.h" -/* - * TODO: panel support - */ - /* ----------------------------------------------------------------------------- * Clock management */ @@ -129,7 +130,6 @@ static void shmob_drm_crtc_setup_geometry(struct shmob_drm_crtc *scrtc) value |= LDMT1R_VPOL; if (mode->flags & DRM_MODE_FLAG_NHSYNC) value |= LDMT1R_HPOL; - lcdc_write(sdev, LDMT1R, value); value = ((mode->hdisplay / 8) << 16) /* HDCN */ @@ -191,7 +191,7 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc) { struct drm_crtc *crtc = &scrtc->base; struct shmob_drm_device *sdev = to_shmob_device(crtc->dev); - const struct shmob_drm_interface_data *idata = &sdev->pdata->iface; + unsigned int clk_div = sdev->config.clk_div; struct device *dev = sdev->dev; u32 value; int ret; @@ -220,17 +220,17 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc) lcdc_write(sdev, LDPMR, 0); value = sdev->lddckr; - if (idata->clk_div) { + if (clk_div) { /* FIXME: sh7724 can only use 42, 48, 54 and 60 for the divider * denominator. */ lcdc_write(sdev, LDDCKPAT1R, 0); - lcdc_write(sdev, LDDCKPAT2R, (1 << (idata->clk_div / 2)) - 1); + lcdc_write(sdev, LDDCKPAT2R, (1 << (clk_div / 2)) - 1); - if (idata->clk_div == 1) + if (clk_div == 1) value |= LDDCKR_MOSEL; else - value |= idata->clk_div; + value |= clk_div; } lcdc_write(sdev, LDDCKR, value); @@ -479,7 +479,7 @@ int shmob_drm_crtc_create(struct shmob_drm_device *sdev) } /* ----------------------------------------------------------------------------- - * Encoder + * Legacy Encoder */ static bool shmob_drm_encoder_mode_fixup(struct drm_encoder *encoder, @@ -508,9 +508,43 @@ static const struct drm_encoder_helper_funcs encoder_helper_funcs = { .mode_fixup = shmob_drm_encoder_mode_fixup, }; +/* ----------------------------------------------------------------------------- + * Encoder + */ + +static int shmob_drm_encoder_init(struct shmob_drm_device *sdev, + struct device_node *enc_node) +{ + struct drm_bridge *bridge; + struct drm_panel *panel; + int ret; + + /* Create a panel bridge */ + panel = of_drm_find_panel(enc_node); + if (IS_ERR(panel)) + return PTR_ERR(panel); + + bridge = devm_drm_panel_bridge_add(sdev->dev, panel); + if (IS_ERR(bridge)) + return PTR_ERR(bridge); + + /* Attach the bridge to the encoder */ + ret = drm_bridge_attach(&sdev->encoder, bridge, NULL, + DRM_BRIDGE_ATTACH_NO_CONNECTOR); + if (ret) { + dev_err(sdev->dev, "failed to attach bridge %pOF: %pe\n", + bridge->of_node, ERR_PTR(ret)); + return ret; + } + + return 0; +} + int shmob_drm_encoder_create(struct shmob_drm_device *sdev) { struct drm_encoder *encoder = &sdev->encoder; + struct device_node *np = sdev->dev->of_node; + struct device_node *ep_node, *entity; int ret; encoder->possible_crtcs = 1; @@ -520,13 +554,45 @@ int shmob_drm_encoder_create(struct shmob_drm_device *sdev) if (ret < 0) return ret; - drm_encoder_helper_add(encoder, &encoder_helper_funcs); + if (sdev->pdata) { + drm_encoder_helper_add(encoder, &encoder_helper_funcs); + return 0; + } + + for_each_endpoint_of_node(np, ep_node) { + struct of_endpoint ep; + + ret = of_graph_parse_endpoint(ep_node, &ep); + if (ret < 0) { + of_node_put(ep_node); + return ret; + } + /* Ignore all but the LCD port */ + if (ep.port || ep.id) + continue; + + entity = of_graph_get_remote_port_parent(ep.local_node); + if (!entity) + continue; + + if (!of_device_is_available(entity)) { + of_node_put(entity); + continue; + } + + ret = shmob_drm_encoder_init(sdev, entity); + if (ret < 0) { + of_node_put(entity); + of_node_put(ep_node); + return ret; + } + } return 0; } /* ----------------------------------------------------------------------------- - * Connector + * Legacy Connector */ static inline struct shmob_drm_connector *to_shmob_connector(struct drm_connector *connector) @@ -626,13 +692,20 @@ shmob_drm_connector_init(struct shmob_drm_device *sdev, return connector; } +/* ----------------------------------------------------------------------------- + * Connector + */ + int shmob_drm_connector_create(struct shmob_drm_device *sdev, struct drm_encoder *encoder) { struct drm_connector *connector; int ret; - connector = shmob_drm_connector_init(sdev, encoder); + if (sdev->pdata) + connector = shmob_drm_connector_init(sdev, encoder); + else + connector = drm_bridge_connector_init(&sdev->ddev, encoder); if (IS_ERR(connector)) { dev_err(sdev->dev, "failed to created connector: %pe\n", connector); diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h index 89a0746f9a35807d..16e1712dd04e0f2b 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h @@ -29,6 +29,7 @@ struct shmob_drm_crtc { wait_queue_head_t flip_wait; }; +/* Legacy connector */ struct shmob_drm_connector { struct drm_connector base; struct drm_encoder *encoder; diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c index 576869164479ec6b..db72ca1c8b2f44c9 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c @@ -11,6 +11,7 @@ #include <linux/io.h> #include <linux/mm.h> #include <linux/module.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/pm.h> #include <linux/pm_runtime.h> @@ -147,11 +148,13 @@ static int shmob_drm_remove(struct platform_device *pdev) static int shmob_drm_probe(struct platform_device *pdev) { struct shmob_drm_platform_data *pdata = pdev->dev.platform_data; + const struct shmob_drm_config *config; struct shmob_drm_device *sdev; struct drm_device *ddev; int ret; - if (pdata == NULL) { + config = of_device_get_match_data(&pdev->dev); + if (!config && !pdata) { dev_err(&pdev->dev, "no platform data\n"); return -EINVAL; } @@ -167,7 +170,13 @@ static int shmob_drm_probe(struct platform_device *pdev) ddev = &sdev->ddev; sdev->dev = &pdev->dev; - sdev->pdata = pdata; + if (config) { + sdev->config = *config; + } else { + sdev->pdata = pdata; + sdev->config.clk_source = pdata->clk_source; + sdev->config.clk_div = pdata->iface.clk_div; + } spin_lock_init(&sdev->irq_lock); platform_set_drvdata(pdev, sdev); @@ -180,7 +189,7 @@ static int shmob_drm_probe(struct platform_device *pdev) if (ret) return ret; - ret = shmob_drm_setup_clocks(sdev, pdata->clk_source); + ret = shmob_drm_setup_clocks(sdev, sdev->config.clk_source); if (ret < 0) return ret; @@ -224,11 +233,23 @@ static int shmob_drm_probe(struct platform_device *pdev) return ret; } +static const struct shmob_drm_config shmob_arm_config = { + .clk_source = SHMOB_DRM_CLK_BUS, + .clk_div = 5, +}; + +static const struct of_device_id shmob_drm_of_table[] __maybe_unused = { + { .compatible = "renesas,r8a7740-lcdc", .data = &shmob_arm_config, }, + { .compatible = "renesas,sh73a0-lcdc", .data = &shmob_arm_config, }, + { /* sentinel */ } +}; + static struct platform_driver shmob_drm_platform_driver = { .probe = shmob_drm_probe, .remove = shmob_drm_remove, .driver = { .name = "shmob-drm", + .of_match_table = of_match_ptr(shmob_drm_of_table), .pm = pm_sleep_ptr(&shmob_drm_pm_ops), }, }; diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h index 18907e5ace51c681..088ac5381e91e61a 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h @@ -20,9 +20,15 @@ struct clk; struct device; struct drm_device; +struct shmob_drm_config { + enum shmob_drm_clk_source clk_source; + unsigned int clk_div; +}; + struct shmob_drm_device { struct device *dev; const struct shmob_drm_platform_data *pdata; + struct shmob_drm_config config; void __iomem *mmio; struct clk *clock;
Add DT support, by: 1. Creating a panel bridge from DT, and attaching it to the encoder, 2. Replacing the custom connector with a bridge connector, 3. Obtaining clock configuration based on the compatible value. Note that for now the driver uses a fixed clock configuration selecting the bus clock, as the current code to select other clock inputs needs changes to support any other SoCs than SH7724. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Cc: Rob Herring <robh+dt@kernel.org> Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> Cc: Conor Dooley <conor+dt@kernel.org> Cc: devicetree@vger.kernel.org --- SH-Mobile AG5 (SH73A0) support is untested. Unbind crashes when drm_encoder_cleanup() calls drm_bridge_detach(), as the bridge (allocated by devm_drm_panel_bridge_add()) has already been freed by that time. Should I allocate my encoder with devm_kzalloc(), instead of embedding it inside struct shmob_drm_device? --- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 101 +++++++++++++++--- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.h | 1 + .../gpu/drm/renesas/shmobile/shmob_drm_drv.c | 27 ++++- .../gpu/drm/renesas/shmobile/shmob_drm_drv.h | 6 ++ 4 files changed, 118 insertions(+), 17 deletions(-)