From c9bdf9e2683e5d273665add2fffbd8504b94f452 Mon Sep 17 00:00:00 2001 From: jsg Date: Fri, 16 Sep 2022 02:22:45 +0000 Subject: [PATCH] drm/radeon: add a force flush to delay work when radeon From Zhenneng Li 5a7a5b2edac4b05abd744eeaebda46d9dacd952d in linux 5.15.y/5.15.68 f461950fdc374a3ada5a63c669d997de4600dffe in mainline linux --- sys/dev/pci/drm/radeon/radeon_device.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/pci/drm/radeon/radeon_device.c b/sys/dev/pci/drm/radeon/radeon_device.c index c1a537bd954..de1220779d0 100644 --- a/sys/dev/pci/drm/radeon/radeon_device.c +++ b/sys/dev/pci/drm/radeon/radeon_device.c @@ -1657,6 +1657,9 @@ int radeon_suspend_kms(struct drm_device *dev, bool suspend, if (r) { /* delay GPU reset to resume */ radeon_fence_driver_force_completion(rdev, i); + } else { + /* finish executing delayed work */ + flush_delayed_work(&rdev->fence_drv[i].lockup_work); } } -- 2.20.1