Commit 0b258ed1 authored by Christian König's avatar Christian König
Browse files

drm: revert "expand replace_fence to support timeline point v2" 



This reverts commit 9a09a423.

The whole interface isn't thought through. Since this function can't
fail we actually can't allocate an object to store the sync point.

Sorry, I should have taken the lead on this from the very beginning and
reviewed it more thoughtfully. Going to propose a new interface as a
follow up change.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Link: https://patchwork.freedesktop.org/patch/265580/
parent 5ff75c48

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -1193,7 +1193,7 @@ static void amdgpu_cs_post_dependencies(struct amdgpu_cs_parser *p) 
	int i;



	for (i = 0; i < p->num_post_dep_syncobjs; ++i)

		drm_syncobj_replace_fence(p->post_dep_syncobjs[i], 0, p->fence);

		drm_syncobj_replace_fence(p->post_dep_syncobjs[i], p->fence);

}



static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,

drivers/gpu/drm/drm_syncobj.c

+6 −8
Original line number Diff line number Diff line
@@ -140,13 +140,11 @@ void drm_syncobj_remove_callback(struct drm_syncobj *syncobj, 
/**

 * drm_syncobj_replace_fence - replace fence in a sync object.

 * @syncobj: Sync object to replace fence in

 * @point: timeline point

 * @fence: fence to install in sync file.

 *

 * This replaces the fence on a sync object, or a timeline point fence.

 * This replaces the fence on a sync object.

 */

void drm_syncobj_replace_fence(struct drm_syncobj *syncobj,

			       u64 point,

			       struct dma_fence *fence)

{

	struct dma_fence *old_fence;
@@ -184,7 +182,7 @@ static void drm_syncobj_assign_null_handle(struct drm_syncobj *syncobj) 
{

	struct dma_fence *fence = dma_fence_get_stub();



	drm_syncobj_replace_fence(syncobj, 0, fence);

	drm_syncobj_replace_fence(syncobj, fence);

	dma_fence_put(fence);

}
@@ -233,7 +231,7 @@ void drm_syncobj_free(struct kref *kref) 
	struct drm_syncobj *syncobj = container_of(kref,

						   struct drm_syncobj,

						   refcount);

	drm_syncobj_replace_fence(syncobj, 0, NULL);

	drm_syncobj_replace_fence(syncobj, NULL);

	kfree(syncobj);

}

EXPORT_SYMBOL(drm_syncobj_free);
@@ -267,7 +265,7 @@ int drm_syncobj_create(struct drm_syncobj **out_syncobj, uint32_t flags, 
		drm_syncobj_assign_null_handle(syncobj);



	if (fence)

		drm_syncobj_replace_fence(syncobj, 0, fence);

		drm_syncobj_replace_fence(syncobj, fence);



	*out_syncobj = syncobj;

	return 0;
@@ -452,7 +450,7 @@ static int drm_syncobj_import_sync_file_fence(struct drm_file *file_private, 
		return -ENOENT;

	}



	drm_syncobj_replace_fence(syncobj, 0, fence);

	drm_syncobj_replace_fence(syncobj, fence);

	dma_fence_put(fence);

	drm_syncobj_put(syncobj);

	return 0;
@@ -923,7 +921,7 @@ drm_syncobj_reset_ioctl(struct drm_device *dev, void *data, 
		return ret;



	for (i = 0; i < args->count_handles; i++)

		drm_syncobj_replace_fence(syncobjs[i], 0, NULL);

		drm_syncobj_replace_fence(syncobjs[i], NULL);



	drm_syncobj_array_free(syncobjs, args->count_handles);

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -2191,7 +2191,7 @@ signal_fence_array(struct i915_execbuffer *eb, 
		if (!(flags & I915_EXEC_FENCE_SIGNAL))

			continue;



		drm_syncobj_replace_fence(syncobj, 0, fence);

		drm_syncobj_replace_fence(syncobj, fence);

	}

}

drivers/gpu/drm/v3d/v3d_gem.c

+1 −2
Original line number Diff line number Diff line
@@ -609,8 +609,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data, 
	/* Update the return sync object for the */

	sync_out = drm_syncobj_find(file_priv, args->out_sync);

	if (sync_out) {

		drm_syncobj_replace_fence(sync_out, 0,

					  exec->render_done_fence);

		drm_syncobj_replace_fence(sync_out, exec->render_done_fence);

		drm_syncobj_put(sync_out);

	}

drivers/gpu/drm/vc4/vc4_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ vc4_queue_submit(struct drm_device *dev, struct vc4_exec_info *exec, 
	exec->fence = &fence->base;



	if (out_sync)

		drm_syncobj_replace_fence(out_sync, 0, exec->fence);

		drm_syncobj_replace_fence(out_sync, exec->fence);



	vc4_update_bo_seqnos(exec, seqno);

CRA Git | Maintained and supported by SUSTech CRA and CCSE