drm/qxl: more fence wait rework

Move qxl_io_notify_oom() call into wait condition.
That way the driver will call it again if one call
wasn't enough.

Also allows to remove the extra dma_fence_is_signaled()
check and the goto.

Fixes: 5a838e5d5825 ("drm/qxl: simplify qxl_fence_wait")
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: http://patchwork.freedesktop.org/patch/msgid/20210217123213.2199186-3-kraxel@redhat.com

diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c
index 6ed673d75f9f29986b15af4a3de7244fe47b536c..579c6de10c8e0b0016dbe0cbe7eee3f8eb1f79d5 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_release.c
+++ b/drivers/gpu/drm/qxl/qxl_release.c
@@ -62,16 +62,12 @@ static long qxl_fence_wait(struct dma_fence *fence, bool intr,
 
        qdev = container_of(fence->lock, struct qxl_device, release_lock);
 
-       if (dma_fence_is_signaled(fence))
-               goto signaled;
-
-       qxl_io_notify_oom(qdev);
        if (!wait_event_timeout(qdev->release_event,
-                               dma_fence_is_signaled(fence),
+                               (dma_fence_is_signaled(fence) ||
+                                (qxl_io_notify_oom(qdev), 0)),
                                timeout))
                return 0;
 
-signaled:
        cur = jiffies;
        if (time_after(cur, end))
                return 0;