drm/nouveau/acpi: Don't print error when we get -EINPROGRESS from pm_runtime

commit 53c26181950ddc3c8ace3c0939c89e9c4d8deeb9 upstream.

Since this isn't actually a failure.

Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: David Airlie <airlied@linux.ie>
Fixes: 79e765ad665d ("drm/nouveau/drm/nouveau: Prevent handling ACPI HPD events too early")
Cc: <stable@vger.kernel.org> # v4.19+
Link: https://patchwork.freedesktop.org/patch/msgid/20220714174234.949259-2-lyude@redhat.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index a7a4b139b5f961c3b84b00d507c5f85a9294d526..00128756dedb0ab24245e89b0d65bf03f3917377 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -543,7 +543,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