From: Lyude Paul <lyude@redhat.com>
To: nouveau@lists.freedesktop.org
Cc: Karol Herbst <kherbst@redhat.com>,
David Airlie <airlied@linux.ie>,
open list <linux-kernel@vger.kernel.org>,
dri-devel@lists.freedesktop.org, Ben Skeggs <bskeggs@redhat.com>,
stable@vger.kernel.org
Subject: [PATCH 1/9] drm/nouveau/kms: Handle -EINPROGRESS in nouveau_connector_hotplug()
Date: Wed, 29 Jul 2020 17:36:55 -0400 [thread overview]
Message-ID: <20200729213703.119137-2-lyude@redhat.com> (raw)
In-Reply-To: <20200729213703.119137-1-lyude@redhat.com>
Looks like that we forgot to handle -EINPROGRESS being returned by
pm_runtime_get(), which can happen if multiple callers try to
asynchronously resume the GPU before it wakes up. This is perfectly
normal and OK, so fix this by treating -EINPROGRESS as success.
Signed-off-by: Lyude Paul <lyude@redhat.com>
Fixes: 3e1a12754d4d ("drm/nouveau: Fix deadlocks in nouveau_connector_detect()")
Cc: stable@vger.kernel.org
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: dri-devel@lists.freedesktop.org
Cc: nouveau@lists.freedesktop.org
Cc: <stable@vger.kernel.org> # v4.19+
---
drivers/gpu/drm/nouveau/nouveau_connector.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 7674025a4bfe8..38e226b8cfd05 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -1173,7 +1173,7 @@ nouveau_connector_hotplug(struct nvif_notify *notify)
}
ret = pm_runtime_get(drm->dev->dev);
- if (ret == 0) {
+ if (ret == 0 || ret == -EINPROGRESS) {
/* We can't block here if there's a pending PM request
* running, as we'll deadlock nouveau_display_fini() when it
* calls nvif_put() on our nvif_notify struct. So, simply
--
2.26.2
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next parent reply other threads:[~2020-07-29 21:37 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200729213703.119137-1-lyude@redhat.com>
2020-07-29 21:36 ` Lyude Paul [this message]
2020-07-29 21:36 ` [PATCH 2/9] drm/nouveau/kms: Fix rpm leak in nouveau_connector_hotplug() Lyude Paul
2020-07-29 21:36 ` [PATCH 3/9] drm/nouveau/kms/fbcon: Correct pm_runtime calls in nouveau_fbcon_release() Lyude Paul
2020-07-29 21:36 ` [PATCH 4/9] drm/nouveau/kms/fbcon: Fix pm_runtime calls in nouveau_fbcon_output_poll_changed() Lyude Paul
2020-07-29 21:36 ` [PATCH 5/9] drm/nouveau/kms/fbcon: Use pm_runtime_put_autosuspend() in suspend work Lyude Paul
2020-07-29 21:37 ` [PATCH 6/9] drm/nouveau/kms: Use pm_runtime_put_autosuspend() in hpd_work Lyude Paul
2020-07-29 21:37 ` [PATCH 7/9] drm/nouveau/kms: Invert conditionals in nouveau_display_acpi_ntfy() Lyude Paul
2020-07-29 21:37 ` [PATCH 8/9] drm/nouveau/kms: Fix runtime PM leak " Lyude Paul
2020-07-29 21:37 ` [PATCH 9/9] drm/nouveau/kms: Handle -EINPROGRESS " Lyude Paul
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=20200729213703.119137-2-lyude@redhat.com \
--to=lyude@redhat.com \
--cc=airlied@linux.ie \
--cc=bskeggs@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=kherbst@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=nouveau@lists.freedesktop.org \
--cc=stable@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: 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).