From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
To: Steven Price <steven.price@arm.com>
Cc: David Airlie <airlied@linux.ie>,
	open list <linux-kernel@vger.kernel.org>,
	dri-devel <dri-devel@lists.freedesktop.org>,
	Boris Brezillon <boris.brezillon@collabora.com>,
	Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Subject: Re: [PATCH] drm/panfrost: Fix module unload
Date: Tue, 3 Nov 2020 09:29:02 +0100	[thread overview]
Message-ID: <CAAObsKA5xnxqARgNCeqwSmu2cPGcpqa=cBRG6AuLVRYYb9AjxA@mail.gmail.com> (raw)
In-Reply-To: <20201030145833.29006-1-steven.price@arm.com>
[-- Attachment #1.1: Type: text/plain, Size: 1956 bytes --]
Looks good, thanks!
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
On Fri, 30 Oct 2020 at 15:59, Steven Price <steven.price@arm.com> wrote:
> When unloading the call to pm_runtime_put_sync_suspend() will attempt to
> turn the GPU cores off, however panfrost_device_fini() will have turned
> the clocks off. This leads to the hardware locking up.
>
> Instead don't call pm_runtime_put_sync_suspend() and instead simply mark
> the device as suspended using pm_runtime_set_suspended(). And also
> include this on the error path in panfrost_probe().
>
> Fixes: aebe8c22a912 ("drm/panfrost: Fix possible suspend in
> panfrost_remove")
> Signed-off-by: Steven Price <steven.price@arm.com>
> ---
>  drivers/gpu/drm/panfrost/panfrost_drv.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c
> b/drivers/gpu/drm/panfrost/panfrost_drv.c
> index 23513869500c..0ac8ad18fdc6 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_drv.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
> @@ -627,6 +627,7 @@ static int panfrost_probe(struct platform_device *pdev)
>  err_out1:
>         pm_runtime_disable(pfdev->dev);
>         panfrost_device_fini(pfdev);
> +       pm_runtime_set_suspended(pfdev->dev);
>  err_out0:
>         drm_dev_put(ddev);
>         return err;
> @@ -641,9 +642,9 @@ static int panfrost_remove(struct platform_device
> *pdev)
>         panfrost_gem_shrinker_cleanup(ddev);
>
>         pm_runtime_get_sync(pfdev->dev);
> -       panfrost_device_fini(pfdev);
> -       pm_runtime_put_sync_suspend(pfdev->dev);
>         pm_runtime_disable(pfdev->dev);
> +       panfrost_device_fini(pfdev);
> +       pm_runtime_set_suspended(pfdev->dev);
>
>         drm_dev_put(ddev);
>         return 0;
> --
> 2.20.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
[-- Attachment #1.2: Type: text/html, Size: 2974 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply	other threads:[~2020-11-03  8:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-30 14:58 [PATCH] drm/panfrost: Fix module unload Steven Price
2020-11-03  8:29 ` Tomeu Vizoso [this message]
2020-11-03  8:45 ` Boris Brezillon
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='CAAObsKA5xnxqARgNCeqwSmu2cPGcpqa=cBRG6AuLVRYYb9AjxA@mail.gmail.com' \
    --to=tomeu.vizoso@collabora.com \
    --cc=airlied@linux.ie \
    --cc=alyssa.rosenzweig@collabora.com \
    --cc=boris.brezillon@collabora.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=steven.price@arm.com \
    /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: link
  Be sure your reply has a Subject: header at the top and a blank line
  before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).