Re: [PATCH 4/8] drm/i915: use new reservation_object_fences helper

2019-08-06 Thread Chris Wilson
Quoting Christian König (2019-08-06 16:01:30)
> Instead of open coding the sequence loop use the new helper.

I've missed something. What reservation_object_fences()?
-Chris
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 4/8] drm/i915: use new reservation_object_fences helper

2019-08-06 Thread Christian König
Instead of open coding the sequence loop use the new helper.

Signed-off-by: Christian König 
---
 drivers/gpu/drm/i915/gem/i915_gem_busy.c | 12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_busy.c 
b/drivers/gpu/drm/i915/gem/i915_gem_busy.c
index 6ad93a09968c..8da0594eda88 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_busy.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_busy.c
@@ -83,7 +83,7 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data,
struct drm_i915_gem_busy *args = data;
struct drm_i915_gem_object *obj;
struct reservation_object_list *list;
-   unsigned int seq;
+   struct dma_fence *excl;
int err;
 
err = -ENOENT;
@@ -109,15 +109,12 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data,
 * to report the overall busyness. This is what the wait-ioctl does.
 *
 */
-retry:
-   seq = raw_read_seqcount(>base.resv->seq);
+   reservation_object_fences(obj->base.resv, , );
 
/* Translate the exclusive fence to the READ *and* WRITE engine */
-   args->busy =
-   busy_check_writer(rcu_dereference(obj->base.resv->fence_excl));
+   args->busy = busy_check_writer(excl);
 
/* Translate shared fences to READ set of engines */
-   list = rcu_dereference(obj->base.resv->fence);
if (list) {
unsigned int shared_count = list->shared_count, i;
 
@@ -129,9 +126,6 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data,
}
}
 
-   if (args->busy && read_seqcount_retry(>base.resv->seq, seq))
-   goto retry;
-
err = 0;
 out:
rcu_read_unlock();
-- 
2.17.1

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel