Commit 790f27e0 authored by Christian König's avatar Christian König

drm/etnaviv: use dma_resv_describe

Instead of dumping the fence info manually.
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211103081231.18578-4-christian.koenig@amd.com
parent f19ee2f3
...@@ -424,36 +424,24 @@ int etnaviv_gem_wait_bo(struct etnaviv_gpu *gpu, struct drm_gem_object *obj, ...@@ -424,36 +424,24 @@ int etnaviv_gem_wait_bo(struct etnaviv_gpu *gpu, struct drm_gem_object *obj,
} }
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
static void etnaviv_gem_describe_fence(struct dma_fence *fence,
const char *type, struct seq_file *m)
{
seq_printf(m, "\t%9s: %s %s seq %llu\n", type,
fence->ops->get_driver_name(fence),
fence->ops->get_timeline_name(fence),
fence->seqno);
}
static void etnaviv_gem_describe(struct drm_gem_object *obj, struct seq_file *m) static void etnaviv_gem_describe(struct drm_gem_object *obj, struct seq_file *m)
{ {
struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj); struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj);
struct dma_resv *robj = obj->resv; struct dma_resv *robj = obj->resv;
struct dma_resv_iter cursor;
struct dma_fence *fence;
unsigned long off = drm_vma_node_start(&obj->vma_node); unsigned long off = drm_vma_node_start(&obj->vma_node);
int r;
seq_printf(m, "%08x: %c %2d (%2d) %08lx %p %zd\n", seq_printf(m, "%08x: %c %2d (%2d) %08lx %p %zd\n",
etnaviv_obj->flags, is_active(etnaviv_obj) ? 'A' : 'I', etnaviv_obj->flags, is_active(etnaviv_obj) ? 'A' : 'I',
obj->name, kref_read(&obj->refcount), obj->name, kref_read(&obj->refcount),
off, etnaviv_obj->vaddr, obj->size); off, etnaviv_obj->vaddr, obj->size);
dma_resv_iter_begin(&cursor, robj, true); r = dma_resv_lock(robj, NULL);
dma_resv_for_each_fence_unlocked(&cursor, fence) { if (r)
if (dma_resv_iter_is_exclusive(&cursor)) return;
etnaviv_gem_describe_fence(fence, "Exclusive", m);
else dma_resv_describe(robj, m);
etnaviv_gem_describe_fence(fence, "Shared", m); dma_resv_unlock(robj);
}
dma_resv_iter_end(&cursor);
} }
void etnaviv_gem_describe_objects(struct etnaviv_drm_private *priv, void etnaviv_gem_describe_objects(struct etnaviv_drm_private *priv,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment