From: Gerd Hoffmann <kraxel@redhat.com>
To: dri-devel@lists.freedesktop.org
Cc: Gerd Hoffmann <kraxel@redhat.com>,
Dave Airlie <airlied@redhat.com>, David Airlie <airlied@linux.ie>,
Daniel Vetter <daniel@ffwll.ch>,
Thomas Zimmermann <tzimmermann@suse.de>,
virtualization@lists.linux-foundation.org (open list:DRM DRIVER
FOR QXL VIRTUAL GPU),
spice-devel@lists.freedesktop.org (open list:DRM DRIVER FOR QXL
VIRTUAL GPU), linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 02/10] drm/qxl: more fence wait rework
Date: Tue, 16 Feb 2021 12:37:08 +0100 [thread overview]
Message-ID: <20210216113716.716996-3-kraxel@redhat.com> (raw)
In-Reply-To: <20210216113716.716996-1-kraxel@redhat.com>
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>
---
drivers/gpu/drm/qxl/qxl_release.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c
index 6ed673d75f9f..63818b56218c 100644
--- a/drivers/gpu/drm/qxl/qxl_release.c
+++ b/drivers/gpu/drm/qxl/qxl_release.c
@@ -62,16 +62,13 @@ 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;
--
2.29.2
next prev parent reply other threads:[~2021-02-16 11:39 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210216113716.716996-1-kraxel@redhat.com>
2021-02-16 11:37 ` [PATCH 01/10] drm/qxl: properly handle device init failures Gerd Hoffmann
2021-02-16 13:08 ` Thomas Zimmermann
2021-02-16 11:37 ` Gerd Hoffmann [this message]
2021-02-16 11:37 ` [PATCH 03/10] drm/qxl: use ttm bo priorities Gerd Hoffmann
2021-02-16 11:37 ` [PATCH 04/10] drm/qxl: fix lockdep issue in qxl_alloc_release_reserved Gerd Hoffmann
2021-02-16 11:37 ` [PATCH 05/10] drm/qxl: rename qxl_bo_kmap -> qxl_bo_kmap_locked Gerd Hoffmann
2021-02-16 13:14 ` Thomas Zimmermann
2021-02-16 11:37 ` [PATCH 06/10] drm/qxl: add qxl_bo_kmap/qxl_bo_kunmap Gerd Hoffmann
2021-02-16 13:17 ` Thomas Zimmermann
2021-02-16 11:37 ` [PATCH 07/10] drm/qxl: fix prime kmap Gerd Hoffmann
2021-02-16 13:16 ` Thomas Zimmermann
2021-02-16 11:37 ` [PATCH 08/10] drm/qxl: fix monitors object kmap Gerd Hoffmann
2021-02-16 13:18 ` Thomas Zimmermann
2021-02-16 11:37 ` [PATCH 09/10] drm/qxl: map/unmap framebuffers in prepare_fb+cleanup_fb callbacks Gerd Hoffmann
2021-02-16 13:27 ` Thomas Zimmermann
2021-02-16 13:46 ` Thomas Zimmermann
2021-02-17 10:02 ` Gerd Hoffmann
2021-02-17 10:23 ` Thomas Zimmermann
2021-02-16 11:37 ` [PATCH 10/10] drm/qxl: add lock asserts to qxl_bo_kmap_locked + qxl_bo_kunmap_locked Gerd Hoffmann
2021-02-16 13:30 ` Thomas Zimmermann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210216113716.716996-3-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=airlied@linux.ie \
--cc=airlied@redhat.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=spice-devel@lists.freedesktop.org \
--cc=tzimmermann@suse.de \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).