Merge tag 'drm-next-2022-08-03' of git://anongit.freedesktop.org/drm/drm

[linux-2.6-microblaze.git] / drivers / gpu / drm / nouveau / nouveau_display.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 2cd0932..a2f5df5 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -515,7 +515,7 @@ nouveau_display_hpd_work(struct work_struct *work)
 
        pm_runtime_mark_last_busy(drm->dev->dev);
 noop:
-       pm_runtime_put_sync(drm->dev->dev);
+       pm_runtime_put_autosuspend(dev->dev);
 }
 
 #ifdef CONFIG_ACPI
@@ -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