2021-02-17 12:35:53

by Gerd Hoffmann

[permalink] [raw]

Subject: [PATCH v2 02/11] 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 <[email protected]>
---
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;
--
2.29.2

2021-02-17 22:31:47

by Thomas Zimmermann

[permalink] [raw]

Subject: Re: [PATCH v2 02/11] drm/qxl: more fence wait rework

---

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 <[email protected]>

Acked-by: Thomas Zimmermann <[email protected]>

> ---
> 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

---

Attachments:

OpenPGP_signature (855.00 B)
OpenPGP digital signature