lkml.org 
[lkml]   [2021]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH v5 6/6] drm/qxl: simplify qxl_fence_wait
From
Date


Am 03.02.21 um 14:16 schrieb Gerd Hoffmann:
> Now that we have the new release_event wait queue we can just
> use that in qxl_fence_wait() and simplify the code alot.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>

> ---
> drivers/gpu/drm/qxl/qxl_release.c | 42 +++----------------------------
> 1 file changed, 4 insertions(+), 38 deletions(-)
>
> diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c
> index 43a5436853b7..b6f4b8dcf228 100644
> --- a/drivers/gpu/drm/qxl/qxl_release.c
> +++ b/drivers/gpu/drm/qxl/qxl_release.c
> @@ -59,53 +59,19 @@ static long qxl_fence_wait(struct dma_fence *fence, bool intr,
> {
> struct qxl_device *qdev;
> struct qxl_release *release;
> - int count = 0, sc = 0;
> - bool have_drawable_releases;
> unsigned long cur, end = jiffies + timeout;
>
> 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))
> goto signaled;
>
> qxl_io_notify_oom(qdev);
> -
> - for (count = 0; count < 11; count++) {
> - if (!qxl_queue_garbage_collect(qdev, true))
> - break;
> -
> - 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.
> - */
> + if (!wait_event_timeout(qdev->release_event,
> + dma_fence_is_signaled(fence),
> + timeout))
> + return 0;
>
> signaled:
> cur = jiffies;
>

--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2021-02-03 15:18    [W:0.154 / U:0.132 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site