Browse Source

drm/amdgpu: remove unused parent entity

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Christian König 10 years ago
parent
commit
ddf94d33d6

+ 1 - 1
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c

@@ -48,7 +48,7 @@ int amdgpu_ctx_init(struct amdgpu_device *adev, bool kernel,
 				rq = &adev->rings[i]->scheduler->sched_rq;
 			r = amd_context_entity_init(adev->rings[i]->scheduler,
 						    &ctx->rings[i].c_entity,
-						    NULL, rq, amdgpu_sched_jobs);
+						    rq, amdgpu_sched_jobs);
 			if (r)
 				break;
 		}

+ 0 - 3
drivers/gpu/drm/amd/scheduler/gpu_scheduler.c

@@ -177,7 +177,6 @@ exit:
  *
  * @sched	The pointer to the scheduler
  * @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
  * @kernel	If this is an entity for the kernel
  * @jobs	The max number of jobs in the job queue
@@ -186,7 +185,6 @@ exit:
 */
 int amd_context_entity_init(struct amd_gpu_scheduler *sched,
 			    struct amd_context_entity *entity,
-			    struct amd_sched_entity *parent,
 			    struct amd_run_queue *rq,
 			    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;
 	spin_lock_init(&entity->lock);
 	entity->generic_entity.belongto_rq = rq;
-	entity->generic_entity.parent = parent;
 	entity->scheduler = sched;
 	init_waitqueue_head(&entity->wait_queue);
 	init_waitqueue_head(&entity->wait_emit);

+ 0 - 2
drivers/gpu/drm/amd/scheduler/gpu_scheduler.h

@@ -41,7 +41,6 @@ struct amd_run_queue;
 struct amd_sched_entity {
 	struct list_head		list;
 	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,
 			    struct amd_context_entity *entity,
-			    struct amd_sched_entity *parent,
 			    struct amd_run_queue *rq,
 			    uint32_t jobs);