From: Daniel Vetter <daniel@ffwll.ch> To: Miaoqian Lin <linmq006@gmail.com> Cc: Emma Anholt <emma@anholt.net>, David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, Eric Anholt <eric@anholt.net>, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3] drm/v3d/v3d_drv: Fix PM disable depth imbalance Date: Wed, 1 Jun 2022 15:26:33 +0200 [thread overview] Message-ID: <YpdpCWW9+igsVydr@phenom.ffwll.local> (raw) In-Reply-To: <20220601122050.1822-1-linmq006@gmail.com> On Wed, Jun 01, 2022 at 04:20:50PM +0400, Miaoqian Lin wrote: > The pm_runtime_enable will increase power disable depth. > If the probe fails, we should use pm_runtime_disable() to balance > pm_runtime_enable(). > Also call disable function in remove function. > > Fixes: 57692c94dcbe ("drm/v3d: Introduce a new DRM driver for Broadcom V3D V3.x+") > Signed-off-by: Miaoqian Lin <linmq006@gmail.com> > --- > Changes in v3: > - call pm_runtime_disable() in v3d_platform_drm_remove > - update commit message > > Changes in v2 > - put pm_runtime_disable before dma_free_wc > - rename dma_free to pm_disable > > v1: https://lore.kernel.org/r/20220105120442.14418-1-linmq006@gmail.com > v2: https://lore.kernel.org/r/20220106124657.32737-1-linmq006@gmail.com Maybe a bit late since we're at v3 already, but are there no devm_ functions here that would dtrt automatically? Or is there another reason we can't use them? -Daniel > --- > drivers/gpu/drm/v3d/v3d_drv.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c > index 1afcd54fbbd5..f3380399fe17 100644 > --- a/drivers/gpu/drm/v3d/v3d_drv.c > +++ b/drivers/gpu/drm/v3d/v3d_drv.c > @@ -286,7 +286,7 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) > > ret = v3d_gem_init(drm); > if (ret) > - goto dma_free; > + goto pm_disable; > > ret = v3d_irq_init(v3d); > if (ret) > @@ -302,7 +302,8 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) > v3d_irq_disable(v3d); > gem_destroy: > v3d_gem_destroy(drm); > -dma_free: > +pm_disable: > + pm_runtime_disable(dev); > dma_free_wc(dev, 4096, v3d->mmu_scratch, v3d->mmu_scratch_paddr); > return ret; > } > @@ -316,6 +317,7 @@ static int v3d_platform_drm_remove(struct platform_device *pdev) > > v3d_gem_destroy(drm); > > + pm_runtime_disable(&pdev->dev); > dma_free_wc(v3d->drm.dev, 4096, v3d->mmu_scratch, > v3d->mmu_scratch_paddr); > > -- > 2.25.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel@ffwll.ch> To: Miaoqian Lin <linmq006@gmail.com> Cc: Emma Anholt <emma@anholt.net>, David Airlie <airlied@linux.ie>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Eric Anholt <eric@anholt.net> Subject: Re: [PATCH v3] drm/v3d/v3d_drv: Fix PM disable depth imbalance Date: Wed, 1 Jun 2022 15:26:33 +0200 [thread overview] Message-ID: <YpdpCWW9+igsVydr@phenom.ffwll.local> (raw) In-Reply-To: <20220601122050.1822-1-linmq006@gmail.com> On Wed, Jun 01, 2022 at 04:20:50PM +0400, Miaoqian Lin wrote: > The pm_runtime_enable will increase power disable depth. > If the probe fails, we should use pm_runtime_disable() to balance > pm_runtime_enable(). > Also call disable function in remove function. > > Fixes: 57692c94dcbe ("drm/v3d: Introduce a new DRM driver for Broadcom V3D V3.x+") > Signed-off-by: Miaoqian Lin <linmq006@gmail.com> > --- > Changes in v3: > - call pm_runtime_disable() in v3d_platform_drm_remove > - update commit message > > Changes in v2 > - put pm_runtime_disable before dma_free_wc > - rename dma_free to pm_disable > > v1: https://lore.kernel.org/r/20220105120442.14418-1-linmq006@gmail.com > v2: https://lore.kernel.org/r/20220106124657.32737-1-linmq006@gmail.com Maybe a bit late since we're at v3 already, but are there no devm_ functions here that would dtrt automatically? Or is there another reason we can't use them? -Daniel > --- > drivers/gpu/drm/v3d/v3d_drv.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c > index 1afcd54fbbd5..f3380399fe17 100644 > --- a/drivers/gpu/drm/v3d/v3d_drv.c > +++ b/drivers/gpu/drm/v3d/v3d_drv.c > @@ -286,7 +286,7 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) > > ret = v3d_gem_init(drm); > if (ret) > - goto dma_free; > + goto pm_disable; > > ret = v3d_irq_init(v3d); > if (ret) > @@ -302,7 +302,8 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) > v3d_irq_disable(v3d); > gem_destroy: > v3d_gem_destroy(drm); > -dma_free: > +pm_disable: > + pm_runtime_disable(dev); > dma_free_wc(dev, 4096, v3d->mmu_scratch, v3d->mmu_scratch_paddr); > return ret; > } > @@ -316,6 +317,7 @@ static int v3d_platform_drm_remove(struct platform_device *pdev) > > v3d_gem_destroy(drm); > > + pm_runtime_disable(&pdev->dev); > dma_free_wc(v3d->drm.dev, 4096, v3d->mmu_scratch, > v3d->mmu_scratch_paddr); > > -- > 2.25.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
next prev parent reply other threads:[~2022-06-01 13:26 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-06-01 12:20 [PATCH v3] drm/v3d/v3d_drv: Fix PM disable depth imbalance Miaoqian Lin 2022-06-01 13:26 ` Daniel Vetter [this message] 2022-06-01 13:26 ` Daniel Vetter 2022-06-01 13:55 ` Miaoqian Lin 2022-06-01 14:47 ` Thierry Reding 2022-06-01 14:47 ` Thierry Reding 2022-06-02 2:05 ` Miaoqian Lin 2022-06-02 2:05 ` Miaoqian Lin
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=YpdpCWW9+igsVydr@phenom.ffwll.local \ --to=daniel@ffwll.ch \ --cc=airlied@linux.ie \ --cc=dri-devel@lists.freedesktop.org \ --cc=emma@anholt.net \ --cc=eric@anholt.net \ --cc=linmq006@gmail.com \ --cc=linux-kernel@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.