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

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

drm/amdgpu: remove unused parent entity 



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

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -48,7 +48,7 @@ int amdgpu_ctx_init(struct amdgpu_device *adev, bool kernel, 
				rq = &adev->rings[i]->scheduler->sched_rq;

				rq = &adev->rings[i]->scheduler->sched_rq;

			r = amd_context_entity_init(adev->rings[i]->scheduler,

			r = amd_context_entity_init(adev->rings[i]->scheduler,

						    &ctx->rings[i].c_entity,

						    &ctx->rings[i].c_entity,

						    NULL, rq, amdgpu_sched_jobs);

						    rq, amdgpu_sched_jobs);

			if (r)

			if (r)

				break;

				break;

		}

		}

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

+0 −3
Original line number Original line Diff line number Diff line
@@ -177,7 +177,6 @@ static struct amd_context_entity *select_context( 
 *

 *

 * @sched	The pointer to the scheduler

 * @sched	The pointer to the scheduler

 * @entity	The pointer to a valid amd_context_entity

 * @entity	The pointer to a valid amd_context_entity

 * @parent	The parent entity of this amd_context_entity

 * @rq		The run queue this entity belongs

 * @rq		The run queue this entity belongs

 * @kernel	If this is an entity for the kernel

 * @kernel	If this is an entity for the kernel

 * @jobs	The max number of jobs in the job queue

 * @jobs	The max number of jobs in the job queue
@@ -186,7 +185,6 @@ static struct amd_context_entity *select_context( 
*/

*/

int amd_context_entity_init(struct amd_gpu_scheduler *sched,

int amd_context_entity_init(struct amd_gpu_scheduler *sched,

			    struct amd_context_entity *entity,

			    struct amd_context_entity *entity,

			    struct amd_sched_entity *parent,

			    struct amd_run_queue *rq,

			    struct amd_run_queue *rq,

			    uint32_t jobs)

			    uint32_t jobs)

{

{
@@ -199,7 +197,6 @@ int amd_context_entity_init(struct amd_gpu_scheduler *sched, 
	seq_ring = ((uint64_t)sched->ring_id) << 60;

	seq_ring = ((uint64_t)sched->ring_id) << 60;

	spin_lock_init(&entity->lock);

	spin_lock_init(&entity->lock);

	entity->generic_entity.belongto_rq = rq;

	entity->generic_entity.belongto_rq = rq;

	entity->generic_entity.parent = parent;

	entity->scheduler = sched;

	entity->scheduler = sched;

	init_waitqueue_head(&entity->wait_queue);

	init_waitqueue_head(&entity->wait_queue);

	init_waitqueue_head(&entity->wait_emit);

	init_waitqueue_head(&entity->wait_emit);

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -41,7 +41,6 @@ struct amd_run_queue; 
struct amd_sched_entity {

struct amd_sched_entity {

	struct list_head		list;

	struct list_head		list;

	struct amd_run_queue		*belongto_rq;

	struct amd_run_queue		*belongto_rq;

	struct amd_sched_entity	        *parent;

};

};





/**

/**
@@ -149,7 +148,6 @@ int amd_context_entity_fini(struct amd_gpu_scheduler *sched, 




int amd_context_entity_init(struct amd_gpu_scheduler *sched,

int amd_context_entity_init(struct amd_gpu_scheduler *sched,

			    struct amd_context_entity *entity,

			    struct amd_context_entity *entity,

			    struct amd_sched_entity *parent,

			    struct amd_run_queue *rq,

			    struct amd_run_queue *rq,

			    uint32_t jobs);

			    uint32_t jobs);