summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd
diff options
context:
space:
mode:
authorChristian König2015-08-05 18:11:14 +0200
committerAlex Deucher2015-08-17 22:51:03 +0200
commitddf94d33d6434199be08f8965f63d408e2787539 (patch)
tree81d11800319843a66ea1764ee5afe00ea571ec61 /drivers/gpu/drm/amd
parentdrm/amdgpu: process sched job exactly triggered by fence signal (diff)
downloadkernel-qcow2-linux-ddf94d33d6434199be08f8965f63d408e2787539.tar.gz
kernel-qcow2-linux-ddf94d33d6434199be08f8965f63d408e2787539.tar.xz
kernel-qcow2-linux-ddf94d33d6434199be08f8965f63d408e2787539.zip
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>
Diffstat (limited to 'drivers/gpu/drm/amd')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c2
-rw-r--r--drivers/gpu/drm/amd/scheduler/gpu_scheduler.c3
-rw-r--r--drivers/gpu/drm/amd/scheduler/gpu_scheduler.h2
3 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
index 08a9292729dc..e04364cdcc9e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
+++ b/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;
}
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
index 4c2c5adbc537..6f0d40b13a23 100644
--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
+++ b/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);
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
index 8a756a565583..64ef0e2b1543 100644
--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
+++ b/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);