nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

drm/qxl: simplify qxl_fence_wait

Browse source 
Now that we have the new release_event wait queue we can just
use that in qxl_fence_wait() and simplify the code a lot.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: http://patchwork.freedesktop.org/patch/msgid/20210204145712.1531203-10-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2021-02-04 15:57:10 +01:00
parent 5f6c871fe9
commit 5a838e5d58
1 changed files with 4 additions and 40 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

44
drivers/gpu/drm/qxl/qxl_release.c
View file

@ -58,54 +58,18 @@ static long qxl_fence_wait(struct dma_fence *fence, bool intr,
signed long timeout) signed long timeout)
{ {
struct qxl_device *qdev; struct qxl_device *qdev;
struct qxl_release *release;
int count = 0, sc = 0;
bool have_drawable_releases;
unsigned long cur, end = jiffies + timeout; unsigned long cur, end = jiffies + timeout;
qdev = container_of(fence->lock, struct qxl_device, release_lock); qdev = container_of(fence->lock, struct qxl_device, release_lock);
release = container_of(fence, struct qxl_release, base);
have_drawable_releases = release->type == QXL_RELEASE_DRAWABLE;
retry:
sc++;
if (dma_fence_is_signaled(fence)) if (dma_fence_is_signaled(fence))
goto signaled; goto signaled;
qxl_io_notify_oom(qdev); qxl_io_notify_oom(qdev);
if (!wait_event_timeout(qdev->release_event,
for (count = 0; count < 11; count++) { dma_fence_is_signaled(fence),
if (!qxl_queue_garbage_collect(qdev, true)) timeout))
break; return 0;
if (dma_fence_is_signaled(fence))
goto signaled;
}
if (dma_fence_is_signaled(fence))
goto signaled;
if (have_drawable_releases || sc < 4) {
if (sc > 2)
/* back off */
usleep_range(500, 1000);
if (time_after(jiffies, end))
return 0;
if (have_drawable_releases && sc > 300) {
DMA_FENCE_WARN(fence, "failed to wait on release %llu "
"after spincount %d\n",
fence->context & ~0xf0000000, sc);
goto signaled;
}
goto retry;
}
/*
* yeah, original sync_obj_wait gave up after 3 spins when
* have_drawable_releases is not set.
*/
signaled: signaled:
cur = jiffies; cur = jiffies;