Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 046c12c6 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: remove sync_to from sync obj v2 



Not needed any more without semaphores.

v2: remove unused variables as well

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ea5e4c87

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+0 −1
Original line number Diff line number Diff line
@@ -636,7 +636,6 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp, 
 * Synchronization

 */

struct amdgpu_sync {

	struct fence		*sync_to[AMDGPU_MAX_RINGS];

	DECLARE_HASHTABLE(fences, 4);

	struct fence	        *last_vm_update;

};

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

+9 −35
Original line number Diff line number Diff line
@@ -46,11 +46,6 @@ struct amdgpu_sync_entry { 
 */

void amdgpu_sync_create(struct amdgpu_sync *sync)

{

	unsigned i;



	for (i = 0; i < AMDGPU_MAX_RINGS; ++i)

		sync->sync_to[i] = NULL;



	hash_init(sync->fences);

	sync->last_vm_update = NULL;

}
@@ -104,7 +99,6 @@ int amdgpu_sync_fence(struct amdgpu_device *adev, struct amdgpu_sync *sync, 
		      struct fence *f)

{

	struct amdgpu_sync_entry *e;

	struct amdgpu_fence *fence;



	if (!f)

		return 0;
@@ -113,8 +107,6 @@ int amdgpu_sync_fence(struct amdgpu_device *adev, struct amdgpu_sync *sync, 
	    amdgpu_sync_test_owner(f, AMDGPU_FENCE_OWNER_VM))

		amdgpu_sync_keep_later(&sync->last_vm_update, f);



	fence = to_amdgpu_fence(f);

	if (!fence || fence->ring->adev != adev) {

	hash_for_each_possible(sync->fences, e, node, f->context) {

		if (unlikely(e->fence->context != f->context))

			continue;
@@ -132,11 +124,6 @@ int amdgpu_sync_fence(struct amdgpu_device *adev, struct amdgpu_sync *sync, 
	return 0;

}



	amdgpu_sync_keep_later(&sync->sync_to[fence->ring->idx], f);



	return 0;

}



static void *amdgpu_sync_get_owner(struct fence *f)

{

	struct amdgpu_fence *a_fence = to_amdgpu_fence(f);
@@ -247,16 +234,6 @@ int amdgpu_sync_wait(struct amdgpu_sync *sync) 
		kfree(e);

	}



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

		struct fence *fence = sync->sync_to[i];

		if (!fence)

			continue;



		r = fence_wait(fence, false);

		if (r)

			return r;

	}



	return 0;

}
@@ -283,8 +260,5 @@ void amdgpu_sync_free(struct amdgpu_device *adev, 
		kfree(e);

	}



	for (i = 0; i < AMDGPU_MAX_RINGS; ++i)

		fence_put(sync->sync_to[i]);



	fence_put(sync->last_vm_update);

}