Am 17.02.21 um 13:32 schrieb Gerd Hoffmann:> 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 at redhat.com>
Acked-by: Thomas Zimmermann <tzimmermann at suse.de>
> ---
> drivers/gpu/drm/qxl/qxl_release.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/qxl/qxl_release.c
b/drivers/gpu/drm/qxl/qxl_release.c
> index 6ed673d75f9f..579c6de10c8e 100644
> --- 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;
>
--
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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL:
<http://lists.linuxfoundation.org/pipermail/virtualization/attachments/20210217/12d87e36/attachment.sig>