diff options
| author |   Lyude Paul <lyude@redhat.com> | 2022-07-14 13:42:33 -0400 |
|---|---|---|
| committer | Lyude Paul <lyude@redhat.com> | 2022-07-14 16:38:43 -0400 |
| commit | 53c26181950ddc3c8ace3c0939c89e9c4d8deeb9 (patch) | |
| tree | 1aa7f9994f25544930678871f068aaf7dae8a9b7 | |
| parent | drm/nouveau/kms: Fix failure path for creating DP connectors (diff) | |
| download | linux-dev-53c26181950ddc3c8ace3c0939c89e9c4d8deeb9.tar.xz linux-dev-53c26181950ddc3c8ace3c0939c89e9c4d8deeb9.zip | |
drm/nouveau/acpi: Don't print error when we get -EINPROGRESS from pm_runtime
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
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |