diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0436-drm-amdgpu-remove-unused-parent-entity.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0436-drm-amdgpu-remove-unused-parent-entity.patch | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0436-drm-amdgpu-remove-unused-parent-entity.patch b/common/recipes-kernel/linux/files/0436-drm-amdgpu-remove-unused-parent-entity.patch new file mode 100644 index 00000000..a06c9781 --- /dev/null +++ b/common/recipes-kernel/linux/files/0436-drm-amdgpu-remove-unused-parent-entity.patch @@ -0,0 +1,81 @@ +From ddf94d33d6434199be08f8965f63d408e2787539 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Wed, 5 Aug 2015 18:11:14 +0200 +Subject: [PATCH 0436/1050] drm/amdgpu: remove unused parent entity +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 3 --- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 2 -- + 3 files changed, 1 insertion(+), 6 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +index 08a9292..e04364c 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 4c2c5ad..6f0d40b 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 8a756a5..64ef0e2 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); + +-- +1.9.1 + |