From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> To: Daniel Vetter <daniel@ffwll.ch> Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org Subject: Re: [PATCH] drm: rcar-du: Perform initialization/cleanup at probe/remove time Date: Wed, 21 Oct 2015 15:16:08 +0000 [thread overview] Message-ID: <2416796.7aKg1mPfX6@avalon> (raw) In-Reply-To: <20151020073213.GP13786@phenom.ffwll.local> Hi Daniel, On Tuesday 20 October 2015 09:32:13 Daniel Vetter wrote: > On Tue, Oct 20, 2015 at 01:51:54AM +0300, Laurent Pinchart wrote: > > The drm driver .load() operation is prone to race conditions as it > > initializes the driver after registering the device nodes. Its usage is > > deprecated, inline it in the probe function and call drm_dev_alloc() and > > drm_dev_register() explicitly. > > > > For consistency inline the .unload() handler in the remove function as > > well. > > > > Signed-off-by: Laurent Pinchart > > <laurent.pinchart+renesas@ideasonboard.com> > > --- > > > > drivers/gpu/drm/rcar-du/rcar_du_drv.c | 184 +++++++++++++----------- > > drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c | 11 +- > > drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 11 +- > > drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 11 +- > > 4 files changed, 104 insertions(+), 113 deletions(-) > > > > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c > > b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index bebcc97db5e5..46d628752371 > > 100644 > > --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c > > +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c [snip] > > -static int rcar_du_remove(struct platform_device *pdev) > > +static int rcar_du_probe(struct platform_device *pdev) > > { > > - struct rcar_du_device *rcdu = platform_get_drvdata(pdev); > > + struct device_node *np = pdev->dev.of_node; > > + struct rcar_du_device *rcdu; > > + struct drm_connector *connector; > > + struct drm_device *ddev; > > + struct resource *mem; > > + int ret; > > + > > + if (np = NULL) { > > + dev_err(&pdev->dev, "no device tree node\n"); > > + return -ENODEV; > > + } > > + > > + /* Allocate and initialize the DRM and R-Car device structures. */ > > + rcdu = devm_kzalloc(&pdev->dev, sizeof(*rcdu), GFP_KERNEL); > > + if (rcdu = NULL) > > + return -ENOMEM; > > + > > + init_waitqueue_head(&rcdu->commit.wait); > > > > - drm_put_dev(rcdu->ddev); > > + rcdu->dev = &pdev->dev; > > + rcdu->info = of_match_device(rcar_du_of_table, rcdu->dev)->data; > > + > > + ddev = drm_dev_alloc(&rcar_du_driver, &pdev->dev); > > + if (!ddev) > > + return -ENOMEM; > > + > > + rcdu->ddev = ddev; > > + ddev->dev_private = rcdu; > > + > > + platform_set_drvdata(pdev, rcdu); > > + > > + /* I/O resources */ > > + mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); > > + rcdu->mmio = devm_ioremap_resource(&pdev->dev, mem); > > + if (IS_ERR(rcdu->mmio)) { > > + ret = PTR_ERR(rcdu->mmio); > > + goto error; > > + } > > + > > + /* Initialize vertical blanking interrupts handling. Start with vblank > > + * disabled for all CRTCs. > > + */ > > + ret = drm_vblank_init(ddev, (1 << rcdu->info->num_crtcs) - 1); > > + if (ret < 0) { > > + dev_err(&pdev->dev, "failed to initialize vblank\n"); > > + goto error; > > + } > > + > > + /* DRM/KMS objects */ > > + ret = rcar_du_modeset_init(rcdu); > > + if (ret < 0) { > > + dev_err(&pdev->dev, "failed to initialize DRM/KMS (%d)\n", ret); > > + goto error; > > + } > > + > > + ddev->irq_enabled = 1; > > + > > + /* Register the DRM device with the core and the connectors with > > + * sysfs. > > + */ > > + ret = drm_dev_register(ddev, 0); > > + if (ret) > > + goto error; > > + > > + mutex_lock(&ddev->mode_config.mutex); > > + drm_for_each_connector(connector, ddev) { > > + ret = drm_connector_register(connector); > > + if (ret < 0) > > + break; > > + } > > + mutex_unlock(&ddev->mode_config.mutex); > > I'm wondereding whether we shouldn't just wrap this up in a helper somehow, > like drm_dev_modeset_register. How about drm_connector_plug_all() to match the existing drm_connector_unplug_all() ? > Only trouble is that we might be racing with adding MST connectors already, > and that's where I stopped thinking about it ;-) You'll have to brief me on the MST issue if you want my opinion on the matter :-) > Anyway that aside aside: > > Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Thanks. > > + > > + if (ret < 0) > > + goto error; > > + > > + DRM_INFO("Device %s probed\n", dev_name(&pdev->dev)); > > > > return 0; > > + > > +error: > > + rcar_du_remove(pdev); > > + > > + return ret; > > > > } -- Regards, Laurent Pinchart
WARNING: multiple messages have this Message-ID (diff)
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> To: Daniel Vetter <daniel@ffwll.ch> Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org Subject: Re: [PATCH] drm: rcar-du: Perform initialization/cleanup at probe/remove time Date: Wed, 21 Oct 2015 18:16:08 +0300 [thread overview] Message-ID: <2416796.7aKg1mPfX6@avalon> (raw) In-Reply-To: <20151020073213.GP13786@phenom.ffwll.local> Hi Daniel, On Tuesday 20 October 2015 09:32:13 Daniel Vetter wrote: > On Tue, Oct 20, 2015 at 01:51:54AM +0300, Laurent Pinchart wrote: > > The drm driver .load() operation is prone to race conditions as it > > initializes the driver after registering the device nodes. Its usage is > > deprecated, inline it in the probe function and call drm_dev_alloc() and > > drm_dev_register() explicitly. > > > > For consistency inline the .unload() handler in the remove function as > > well. > > > > Signed-off-by: Laurent Pinchart > > <laurent.pinchart+renesas@ideasonboard.com> > > --- > > > > drivers/gpu/drm/rcar-du/rcar_du_drv.c | 184 +++++++++++++----------- > > drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c | 11 +- > > drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 11 +- > > drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 11 +- > > 4 files changed, 104 insertions(+), 113 deletions(-) > > > > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c > > b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index bebcc97db5e5..46d628752371 > > 100644 > > --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c > > +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c [snip] > > -static int rcar_du_remove(struct platform_device *pdev) > > +static int rcar_du_probe(struct platform_device *pdev) > > { > > - struct rcar_du_device *rcdu = platform_get_drvdata(pdev); > > + struct device_node *np = pdev->dev.of_node; > > + struct rcar_du_device *rcdu; > > + struct drm_connector *connector; > > + struct drm_device *ddev; > > + struct resource *mem; > > + int ret; > > + > > + if (np == NULL) { > > + dev_err(&pdev->dev, "no device tree node\n"); > > + return -ENODEV; > > + } > > + > > + /* Allocate and initialize the DRM and R-Car device structures. */ > > + rcdu = devm_kzalloc(&pdev->dev, sizeof(*rcdu), GFP_KERNEL); > > + if (rcdu == NULL) > > + return -ENOMEM; > > + > > + init_waitqueue_head(&rcdu->commit.wait); > > > > - drm_put_dev(rcdu->ddev); > > + rcdu->dev = &pdev->dev; > > + rcdu->info = of_match_device(rcar_du_of_table, rcdu->dev)->data; > > + > > + ddev = drm_dev_alloc(&rcar_du_driver, &pdev->dev); > > + if (!ddev) > > + return -ENOMEM; > > + > > + rcdu->ddev = ddev; > > + ddev->dev_private = rcdu; > > + > > + platform_set_drvdata(pdev, rcdu); > > + > > + /* I/O resources */ > > + mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); > > + rcdu->mmio = devm_ioremap_resource(&pdev->dev, mem); > > + if (IS_ERR(rcdu->mmio)) { > > + ret = PTR_ERR(rcdu->mmio); > > + goto error; > > + } > > + > > + /* Initialize vertical blanking interrupts handling. Start with vblank > > + * disabled for all CRTCs. > > + */ > > + ret = drm_vblank_init(ddev, (1 << rcdu->info->num_crtcs) - 1); > > + if (ret < 0) { > > + dev_err(&pdev->dev, "failed to initialize vblank\n"); > > + goto error; > > + } > > + > > + /* DRM/KMS objects */ > > + ret = rcar_du_modeset_init(rcdu); > > + if (ret < 0) { > > + dev_err(&pdev->dev, "failed to initialize DRM/KMS (%d)\n", ret); > > + goto error; > > + } > > + > > + ddev->irq_enabled = 1; > > + > > + /* Register the DRM device with the core and the connectors with > > + * sysfs. > > + */ > > + ret = drm_dev_register(ddev, 0); > > + if (ret) > > + goto error; > > + > > + mutex_lock(&ddev->mode_config.mutex); > > + drm_for_each_connector(connector, ddev) { > > + ret = drm_connector_register(connector); > > + if (ret < 0) > > + break; > > + } > > + mutex_unlock(&ddev->mode_config.mutex); > > I'm wondereding whether we shouldn't just wrap this up in a helper somehow, > like drm_dev_modeset_register. How about drm_connector_plug_all() to match the existing drm_connector_unplug_all() ? > Only trouble is that we might be racing with adding MST connectors already, > and that's where I stopped thinking about it ;-) You'll have to brief me on the MST issue if you want my opinion on the matter :-) > Anyway that aside aside: > > Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Thanks. > > + > > + if (ret < 0) > > + goto error; > > + > > + DRM_INFO("Device %s probed\n", dev_name(&pdev->dev)); > > > > return 0; > > + > > +error: > > + rcar_du_remove(pdev); > > + > > + return ret; > > > > } -- Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2015-10-21 15:16 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-10-19 22:51 [PATCH] drm: rcar-du: Perform initialization/cleanup at probe/remove time Laurent Pinchart 2015-10-19 22:51 ` Laurent Pinchart 2015-10-20 7:32 ` Daniel Vetter 2015-10-20 7:32 ` Daniel Vetter 2015-10-21 15:16 ` Laurent Pinchart [this message] 2015-10-21 15:16 ` Laurent Pinchart 2015-10-21 15:39 ` Daniel Vetter 2015-10-21 15:39 ` Daniel Vetter 2015-11-26 18:26 ` Laurent Pinchart 2015-11-26 18:26 ` Laurent Pinchart
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=2416796.7aKg1mPfX6@avalon \ --to=laurent.pinchart@ideasonboard.com \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=laurent.pinchart+renesas@ideasonboard.com \ --cc=linux-sh@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.