Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-08 14:13:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/i915: use new reservation_object_fences helper

Browse Source 
Instead of open coding the sequence loop use the new helper.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/322377/?series=64837&rev=1
This commit is contained in:
Christian König 2019-08-06 16:30:33 +02:00
parent 67c97fb79a
commit dd7a7d1ff2
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/gpu/drm/i915/gem/i915_gem_busy.c
View File

@ -83,7 +83,8 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data,
struct drm_i915_gem_busy *args = data; struct drm_i915_gem_busy *args = data;
struct drm_i915_gem_object *obj; struct drm_i915_gem_object *obj;
struct reservation_object_list *list; struct reservation_object_list *list;
unsigned int seq; unsigned int i, shared_count;
struct dma_fence *excl;
int err; int err;
err = -ENOENT; err = -ENOENT;
@ -109,29 +110,18 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data,
* to report the overall busyness. This is what the wait-ioctl does. * to report the overall busyness. This is what the wait-ioctl does.
* *
*/ */
retry: reservation_object_fences(obj->base.resv, &excl, &list, &shared_count);
seq = raw_read_seqcount(&obj->base.resv->seq);
/* Translate the exclusive fence to the READ *and* WRITE engine */ /* Translate the exclusive fence to the READ *and* WRITE engine */
args->busy = args->busy = busy_check_writer(excl);
busy_check_writer(rcu_dereference(obj->base.resv->fence_excl));
/* Translate shared fences to READ set of engines */ /* Translate shared fences to READ set of engines */
list = rcu_dereference(obj->base.resv->fence); for (i = 0; i < shared_count; ++i) {
if (list) { struct dma_fence *fence = rcu_dereference(list->shared[i]);
unsigned int shared_count = list->shared_count, i;
for (i = 0; i < shared_count; ++i) { args->busy |= busy_check_reader(fence);
struct dma_fence *fence =
rcu_dereference(list->shared[i]);
args->busy |= busy_check_reader(fence);
}
} }
if (args->busy && read_seqcount_retry(&obj->base.resv->seq, seq))
goto retry;
err = 0; err = 0;
out: out:
rcu_read_unlock(); rcu_read_unlock();