This is a note to let you know that I've just added the patch titled
drm/nouveau/acpi: Don't print error when we get -EINPROGRESS from pm_runtime
to the 5.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-nouveau-acpi-don-t-print-error-when-we-get-einpr.patch
and it can be found in the queue-5.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit a3d015c94a8063fa5733033f7e3cb13d9164e73d
Author: Lyude Paul <lyude@xxxxxxxxxx>
Date: Thu Jul 14 13:42:33 2022 -0400
drm/nouveau/acpi: Don't print error when we get -EINPROGRESS from pm_runtime
[ Upstream commit 53c26181950ddc3c8ace3c0939c89e9c4d8deeb9 ]
Since this isn't actually a failure.
Signed-off-by: Lyude Paul <lyude@xxxxxxxxxx>
Reviewed-by: David Airlie <airlied@xxxxxxxx>
Fixes: 79e765ad665d ("drm/nouveau/drm/nouveau: Prevent handling ACPI HPD events too early")
Cc: <stable@xxxxxxxxxxxxxxx> # v4.19+
Link: https://patchwork.freedesktop.org/patch/msgid/20220714174234.949259-2-lyude@xxxxxxxxxx
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 2cd0932b3d68..9f5a45f24e5b 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -537,7 +537,7 @@ nouveau_display_acpi_ntfy(struct notifier_block *nb, unsigned long val,
* it's own hotplug events.
*/
pm_runtime_put_autosuspend(drm->dev->dev);
- } else if (ret == 0) {
+ } else if (ret == 0 || ret == -EINPROGRESS) {
/* We've started resuming the GPU already, so
* it will handle scheduling a full reprobe
* itself
