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

Commit 9788ec40 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: remove some more unused entity members v2 



None of them are used any more.

v2: fix type in error message

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
parent eb98d1c5

drivers/gpu/drm/amd/scheduler/gpu_scheduler.c

+3 −8
Original line number Original line Diff line number Diff line
@@ -149,11 +149,9 @@ int amd_sched_entity_init(struct amd_gpu_scheduler *sched, 
		return -EINVAL;

		return -EINVAL;





	memset(entity, 0, sizeof(struct amd_sched_entity));

	memset(entity, 0, sizeof(struct amd_sched_entity));

	spin_lock_init(&entity->lock);

	entity->belongto_rq = rq;

	entity->belongto_rq = rq;

	entity->scheduler = sched;

	entity->scheduler = sched;

	init_waitqueue_head(&entity->wait_queue);

	init_waitqueue_head(&entity->wait_queue);

	init_waitqueue_head(&entity->wait_emit);

	entity->fence_context = fence_context_alloc(1);

	entity->fence_context = fence_context_alloc(1);

	snprintf(name, sizeof(name), "c_entity[%llu]", entity->fence_context);

	snprintf(name, sizeof(name), "c_entity[%llu]", entity->fence_context);

	memcpy(entity->name, name, 20);

	memcpy(entity->name, name, 20);
@@ -228,12 +226,9 @@ int amd_sched_entity_fini(struct amd_gpu_scheduler *sched, 
		msecs_to_jiffies(AMD_GPU_WAIT_IDLE_TIMEOUT_IN_MS)

		msecs_to_jiffies(AMD_GPU_WAIT_IDLE_TIMEOUT_IN_MS)

		) ?  0 : -1;

		) ?  0 : -1;





	if (r) {

	if (r)

		if (entity->is_pending)

		DRM_INFO("Entity %p is in waiting state during fini\n",

			DRM_INFO("Entity %p is in waiting state during fini,\

				all pending ibs will be canceled.\n",

			 entity);

			 entity);

	}





	amd_sched_rq_remove_entity(rq, entity);

	amd_sched_rq_remove_entity(rq, entity);

	kfifo_free(&entity->job_queue);

	kfifo_free(&entity->job_queue);

drivers/gpu/drm/amd/scheduler/gpu_scheduler.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -41,15 +41,12 @@ struct amd_sched_rq; 
struct amd_sched_entity {

struct amd_sched_entity {

	struct list_head		list;

	struct list_head		list;

	struct amd_sched_rq		*belongto_rq;

	struct amd_sched_rq		*belongto_rq;

	spinlock_t			lock;

	atomic_t			fence_seq;

	atomic_t			fence_seq;

	/* the job_queue maintains the jobs submitted by clients */

	/* the job_queue maintains the jobs submitted by clients */

	struct kfifo                    job_queue;

	struct kfifo                    job_queue;

	spinlock_t			queue_lock;

	spinlock_t			queue_lock;

	struct amd_gpu_scheduler	*scheduler;

	struct amd_gpu_scheduler	*scheduler;

	wait_queue_head_t		wait_queue;

	wait_queue_head_t		wait_queue;

	wait_queue_head_t		wait_emit;

	bool                            is_pending;

	uint64_t                        fence_context;

	uint64_t                        fence_context;

	char                            name[20];

	char                            name[20];

	bool                            need_wakeup;

	bool                            need_wakeup;