From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BD2DCCD3447 for ; Tue, 19 Sep 2023 07:09:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=A9JCucROpLcLnXaLbTV9DQLa4Mjd1wA99j+lp+lBD6I=; b=EPmscMUtWUN9gX uV6zTKQXoOy3sYz/xnH9xsSWBsBAnKbkOz12biddkhoeB/7APtFstY3kH/naY2cOy3lB8Pkw8IGt3 w8If7Ep2l3GHUqjQjARJtSTaJw6VTSALaSz8yHYxvm3/O0lxnw11VrvUR9lRdOGrWCoYKWNG37INw 6DT4e2B2VsnORjjhli1xqH3Q+p1Eldeu8qU+lFw/aaecrGtlVWS1GNE1kXFlcI/wFIlNam91P71MC tD9dkZ5vghgzvxrY5CiZkigfplkaY3KtR1cm+WvQWxG9YzEfohRhhXIlQjzXRdgxPXjr93w5THGM8 wMlppsNxuq0z+wwBbi3A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qiUrU-00HCKx-1i; Tue, 19 Sep 2023 07:09:32 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qiUrR-00HCJZ-1Z for linux-arm-kernel@lists.infradead.org; Tue, 19 Sep 2023 07:09:31 +0000 Received: from [192.168.88.20] (91-154-35-171.elisa-laajakaista.fi [91.154.35.171]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 847C8FA2; Tue, 19 Sep 2023 09:07:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1695107269; bh=1mn0ySDXUgk/nzOh16Ww6lZfnBYBB/YyUmgjtm6Vro8=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=TAiU38ddH5DnwNaTDuK0Vfpkob+UnVlCddC5V875FkcekMoPLITOqPUPTlddvhEyl 81To1hCOz2og7IpAv5MliZDfUya7Fv3zJHrfLrPgP2pRW+e2vrD6J187rl9JrfahPx /gqRjqQTv8pnQzwxrxh3YZgG++RmxLl3Tjroy824= Message-ID: <91956712-0bdf-c932-5f8f-e7bb911f8d9f@ideasonboard.com> Date: Tue, 19 Sep 2023 10:09:20 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: Re: [RFT PATCH 5/6] drm: Call drm_atomic_helper_shutdown() at shutdown/remove time for misc drivers Content-Language: en-US To: Douglas Anderson , dri-devel@lists.freedesktop.org, Maxime Ripard Cc: airlied@gmail.com, airlied@redhat.com, alexandre.torgue@foss.st.com, andrew@aj.id.au, daniel@ffwll.ch, emma@anholt.net, hdegoede@redhat.com, jfalempe@redhat.com, joel@jms.id.au, jyri.sarha@iki.fi, linus.walleij@linaro.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, mcoquelin.stm32@gmail.com, philippe.cornu@foss.st.com, raphael.gallais-pou@foss.st.com, tzimmermann@suse.de, yannick.fertre@foss.st.com References: <20230901234015.566018-1-dianders@chromium.org> <20230901163944.RFT.5.I771eb4bd03d8772b19e7dcfaef3e2c167bce5846@changeid> From: Tomi Valkeinen In-Reply-To: <20230901163944.RFT.5.I771eb4bd03d8772b19e7dcfaef3e2c167bce5846@changeid> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230919_000929_695227_CE287A0B X-CRM114-Status: GOOD ( 35.24 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 02/09/2023 02:39, Douglas Anderson wrote: > Based on grepping through the source code these drivers appear to be > missing a call to drm_atomic_helper_shutdown() at system shutdown time > and at driver remove (or unbind) time. Among other things, this means > that if a panel is in use that it won't be cleanly powered off at > system shutdown time. > > The fact that we should call drm_atomic_helper_shutdown() in the case > of OS shutdown/restart and at driver remove (or unbind) time comes > straight out of the kernel doc "driver instance overview" in > drm_drv.c. Reviewed-by: Tomi Valkeinen and tested on Beagle Bone Black (tilcdc): Tested-by: Tomi Valkeinen # tilcdc Tomi > > A few notes about these fixes: > - I confirmed that these drivers were all DRIVER_MODESET type drivers, > which I believe makes this relevant. > - I confirmed that these drivers were all DRIVER_ATOMIC. > - When adding drm_atomic_helper_shutdown() to the remove/unbind path, > I added it after drm_kms_helper_poll_fini() when the driver had > it. This seemed to be what other drivers did. If > drm_kms_helper_poll_fini() wasn't there I added it straight after > drm_dev_unregister(). > - This patch deals with drivers using the component model in similar > ways as the patch ("drm: Call drm_atomic_helper_shutdown() at > shutdown time for misc drivers") > - These fixes rely on the patch ("drm/atomic-helper: > drm_atomic_helper_shutdown(NULL) should be a noop") to simplify > shutdown. > > Suggested-by: Maxime Ripard > Signed-off-by: Douglas Anderson > --- > > drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 7 +++++++ > drivers/gpu/drm/mgag200/mgag200_drv.c | 8 ++++++++ > drivers/gpu/drm/pl111/pl111_drv.c | 7 +++++++ > drivers/gpu/drm/stm/drv.c | 7 +++++++ > drivers/gpu/drm/tilcdc/tilcdc_drv.c | 11 ++++++++++- > drivers/gpu/drm/tve200/tve200_drv.c | 7 +++++++ > drivers/gpu/drm/vboxvideo/vbox_drv.c | 10 ++++++++++ > 7 files changed, 56 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c > index d207b03f8357..78122b35a0cb 100644 > --- a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c > +++ b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c > @@ -358,11 +358,18 @@ static void aspeed_gfx_remove(struct platform_device *pdev) > sysfs_remove_group(&pdev->dev.kobj, &aspeed_sysfs_attr_group); > drm_dev_unregister(drm); > aspeed_gfx_unload(drm); > + drm_atomic_helper_shutdown(drm); > +} > + > +static void aspeed_gfx_shutdown(struct platform_device *pdev) > +{ > + drm_atomic_helper_shutdown(platform_get_drvdata(pdev)); > } > > static struct platform_driver aspeed_gfx_platform_driver = { > .probe = aspeed_gfx_probe, > .remove_new = aspeed_gfx_remove, > + .shutdown = aspeed_gfx_shutdown, > .driver = { > .name = "aspeed_gfx", > .of_match_table = aspeed_gfx_match, > diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c > index abddf37f0ea1..2fb18b782b05 100644 > --- a/drivers/gpu/drm/mgag200/mgag200_drv.c > +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c > @@ -10,6 +10,7 @@ > #include > > #include > +#include > #include > #include > #include > @@ -278,6 +279,12 @@ static void mgag200_pci_remove(struct pci_dev *pdev) > struct drm_device *dev = pci_get_drvdata(pdev); > > drm_dev_unregister(dev); > + drm_atomic_helper_shutdown(dev); > +} > + > +static void mgag200_pci_shutdown(struct pci_dev *pdev) > +{ > + drm_atomic_helper_shutdown(pci_get_drvdata(pdev)); > } > > static struct pci_driver mgag200_pci_driver = { > @@ -285,6 +292,7 @@ static struct pci_driver mgag200_pci_driver = { > .id_table = mgag200_pciidlist, > .probe = mgag200_pci_probe, > .remove = mgag200_pci_remove, > + .shutdown = mgag200_pci_shutdown, > }; > > drm_module_pci_driver_if_modeset(mgag200_pci_driver, mgag200_modeset); > diff --git a/drivers/gpu/drm/pl111/pl111_drv.c b/drivers/gpu/drm/pl111/pl111_drv.c > index ba3b5b5f0cdf..02e6b74d5016 100644 > --- a/drivers/gpu/drm/pl111/pl111_drv.c > +++ b/drivers/gpu/drm/pl111/pl111_drv.c > @@ -323,12 +323,18 @@ static void pl111_amba_remove(struct amba_device *amba_dev) > struct pl111_drm_dev_private *priv = drm->dev_private; > > drm_dev_unregister(drm); > + drm_atomic_helper_shutdown(drm); > if (priv->panel) > drm_panel_bridge_remove(priv->bridge); > drm_dev_put(drm); > of_reserved_mem_device_release(dev); > } > > +static void pl111_amba_shutdown(struct amba_device *amba_dev) > +{ > + drm_atomic_helper_shutdown(amba_get_drvdata(amba_dev)); > +} > + > /* > * This early variant lacks the 565 and 444 pixel formats. > */ > @@ -431,6 +437,7 @@ static struct amba_driver pl111_amba_driver __maybe_unused = { > }, > .probe = pl111_amba_probe, > .remove = pl111_amba_remove, > + .shutdown = pl111_amba_shutdown, > .id_table = pl111_id_table, > }; > > diff --git a/drivers/gpu/drm/stm/drv.c b/drivers/gpu/drm/stm/drv.c > index c68c831136c9..e8523abef27a 100644 > --- a/drivers/gpu/drm/stm/drv.c > +++ b/drivers/gpu/drm/stm/drv.c > @@ -114,6 +114,7 @@ static void drv_unload(struct drm_device *ddev) > DRM_DEBUG("%s\n", __func__); > > drm_kms_helper_poll_fini(ddev); > + drm_atomic_helper_shutdown(ddev); > ltdc_unload(ddev); > } > > @@ -225,6 +226,11 @@ static void stm_drm_platform_remove(struct platform_device *pdev) > drm_dev_put(ddev); > } > > +static void stm_drm_platform_shutdown(struct platform_device *pdev) > +{ > + drm_atomic_helper_shutdown(platform_get_drvdata(pdev)); > +} > + > static const struct of_device_id drv_dt_ids[] = { > { .compatible = "st,stm32-ltdc"}, > { /* end node */ }, > @@ -234,6 +240,7 @@ MODULE_DEVICE_TABLE(of, drv_dt_ids); > static struct platform_driver stm_drm_platform_driver = { > .probe = stm_drm_platform_probe, > .remove_new = stm_drm_platform_remove, > + .shutdown = stm_drm_platform_shutdown, > .driver = { > .name = "stm32-display", > .of_match_table = drv_dt_ids, > diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c > index fe56beea3e93..8ebd7134ee21 100644 > --- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c > +++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c > @@ -175,6 +175,7 @@ static void tilcdc_fini(struct drm_device *dev) > drm_dev_unregister(dev); > > drm_kms_helper_poll_fini(dev); > + drm_atomic_helper_shutdown(dev); > tilcdc_irq_uninstall(dev); > drm_mode_config_cleanup(dev); > > @@ -389,6 +390,7 @@ static int tilcdc_init(const struct drm_driver *ddrv, struct device *dev) > > init_failed: > tilcdc_fini(ddev); > + platform_set_drvdata(pdev, NULL); > > return ret; > } > @@ -537,7 +539,8 @@ static void tilcdc_unbind(struct device *dev) > if (!ddev->dev_private) > return; > > - tilcdc_fini(dev_get_drvdata(dev)); > + tilcdc_fini(ddev); > + dev_set_drvdata(dev, NULL); > } > > static const struct component_master_ops tilcdc_comp_ops = { > @@ -582,6 +585,11 @@ static int tilcdc_pdev_remove(struct platform_device *pdev) > return 0; > } > > +static void tilcdc_pdev_shutdown(struct platform_device *pdev) > +{ > + drm_atomic_helper_shutdown(platform_get_drvdata(pdev)); > +} > + > static const struct of_device_id tilcdc_of_match[] = { > { .compatible = "ti,am33xx-tilcdc", }, > { .compatible = "ti,da850-tilcdc", }, > @@ -592,6 +600,7 @@ MODULE_DEVICE_TABLE(of, tilcdc_of_match); > static struct platform_driver tilcdc_platform_driver = { > .probe = tilcdc_pdev_probe, > .remove = tilcdc_pdev_remove, > + .shutdown = tilcdc_pdev_shutdown, > .driver = { > .name = "tilcdc", > .pm = pm_sleep_ptr(&tilcdc_pm_ops), > diff --git a/drivers/gpu/drm/tve200/tve200_drv.c b/drivers/gpu/drm/tve200/tve200_drv.c > index 0bb56d063536..acce210e2554 100644 > --- a/drivers/gpu/drm/tve200/tve200_drv.c > +++ b/drivers/gpu/drm/tve200/tve200_drv.c > @@ -242,6 +242,7 @@ static void tve200_remove(struct platform_device *pdev) > struct tve200_drm_dev_private *priv = drm->dev_private; > > drm_dev_unregister(drm); > + drm_atomic_helper_shutdown(drm); > if (priv->panel) > drm_panel_bridge_remove(priv->bridge); > drm_mode_config_cleanup(drm); > @@ -249,6 +250,11 @@ static void tve200_remove(struct platform_device *pdev) > drm_dev_put(drm); > } > > +static void tve200_shutdown(struct platform_device *pdev) > +{ > + drm_atomic_helper_shutdown(platform_get_drvdata(pdev)); > +} > + > static const struct of_device_id tve200_of_match[] = { > { > .compatible = "faraday,tve200", > @@ -263,6 +269,7 @@ static struct platform_driver tve200_driver = { > }, > .probe = tve200_probe, > .remove_new = tve200_remove, > + .shutdown = tve200_shutdown, > }; > drm_module_platform_driver(tve200_driver); > > diff --git a/drivers/gpu/drm/vboxvideo/vbox_drv.c b/drivers/gpu/drm/vboxvideo/vbox_drv.c > index 4fee15c97c34..047b95812334 100644 > --- a/drivers/gpu/drm/vboxvideo/vbox_drv.c > +++ b/drivers/gpu/drm/vboxvideo/vbox_drv.c > @@ -12,6 +12,7 @@ > #include > > #include > +#include > #include > #include > #include > @@ -97,11 +98,19 @@ static void vbox_pci_remove(struct pci_dev *pdev) > struct vbox_private *vbox = pci_get_drvdata(pdev); > > drm_dev_unregister(&vbox->ddev); > + drm_atomic_helper_shutdown(&vbox->ddev); > vbox_irq_fini(vbox); > vbox_mode_fini(vbox); > vbox_hw_fini(vbox); > } > > +static void vbox_pci_shutdown(struct pci_dev *pdev) > +{ > + struct vbox_private *vbox = pci_get_drvdata(pdev); > + > + drm_atomic_helper_shutdown(&vbox->ddev); > +} > + > static int vbox_pm_suspend(struct device *dev) > { > struct vbox_private *vbox = dev_get_drvdata(dev); > @@ -165,6 +174,7 @@ static struct pci_driver vbox_pci_driver = { > .id_table = pciidlist, > .probe = vbox_pci_probe, > .remove = vbox_pci_remove, > + .shutdown = vbox_pci_shutdown, > .driver.pm = pm_sleep_ptr(&vbox_pm_ops), > }; > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel