Commit 8315e297 authored by Christian König's avatar Christian König
Browse files

drm/msm: use new iterator in msm_gem_describe 



Simplifying the code a bit. Also drop the RCU read side lock since the
object is locked anyway.

Untested since I can't get the driver to compile on !ARM.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20211005113742.1101-15-christian.koenig@amd.com
parent a0a8e759

drivers/gpu/drm/msm/msm_gem.c

+5 −14
Original line number Diff line number Diff line
@@ -880,7 +880,7 @@ void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m, 
{

	struct msm_gem_object *msm_obj = to_msm_bo(obj);

	struct dma_resv *robj = obj->resv;

	struct dma_resv_list *fobj;

	struct dma_resv_iter cursor;

	struct dma_fence *fence;

	struct msm_gem_vma *vma;

	uint64_t off = drm_vma_node_start(&obj->vma_node);
@@ -955,21 +955,12 @@ void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m, 
		seq_puts(m, "\n");

	}



	rcu_read_lock();

	fobj = dma_resv_shared_list(robj);

	if (fobj) {

		unsigned int i, shared_count = fobj->shared_count;



		for (i = 0; i < shared_count; i++) {

			fence = rcu_dereference(fobj->shared[i]);

	dma_resv_for_each_fence(&cursor, robj, true, fence) {

		if (dma_resv_iter_is_exclusive(&cursor))

			describe_fence(fence, "Exclusive", m);

		else

			describe_fence(fence, "Shared", m);

	}

	}



	fence = dma_resv_excl_fence(robj);

	if (fence)

		describe_fence(fence, "Exclusive", m);

	rcu_read_unlock();



	msm_gem_unlock(obj);

}