diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0497-drm-amdgpu-add-priv-data-to-sched.patch')
-rw-r--r-- | common/recipes-kernel/linux/files/0497-drm-amdgpu-add-priv-data-to-sched.patch | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/common/recipes-kernel/linux/files/0497-drm-amdgpu-add-priv-data-to-sched.patch b/common/recipes-kernel/linux/files/0497-drm-amdgpu-add-priv-data-to-sched.patch deleted file mode 100644 index 4f9cd9f4..00000000 --- a/common/recipes-kernel/linux/files/0497-drm-amdgpu-add-priv-data-to-sched.patch +++ /dev/null @@ -1,70 +0,0 @@ -From f38fdfddfaab070e3ff2333a79e45169ee33dc28 Mon Sep 17 00:00:00 2001 -From: Chunming Zhou <david1.zhou@amd.com> -Date: Mon, 24 Aug 2015 11:35:26 +0800 -Subject: [PATCH 0497/1050] drm/amdgpu: add priv data to sched - -Signed-off-by: Chunming Zhou <david1.zhou@amd.com> -Reviewed-by: Christian K?nig <christian.koenig@amd.com> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 3 ++- - drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 4 +++- - drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 3 ++- - 3 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c -index e13e445..9787337 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c -@@ -628,7 +628,8 @@ void amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring) - if (amdgpu_enable_scheduler) { - ring->scheduler = amd_sched_create(&amdgpu_sched_ops, - ring->idx, -- amdgpu_sched_hw_submission); -+ amdgpu_sched_hw_submission, -+ (void *)ring->adev); - if (!ring->scheduler) - DRM_ERROR("Failed to create scheduler on ring %d.\n", - ring->idx); -diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c -index 24593fd..2df6f17 100644 ---- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c -+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c -@@ -341,7 +341,8 @@ static int amd_sched_main(void *param) - * Return the pointer to scheduler for success, otherwise return NULL - */ - struct amd_gpu_scheduler *amd_sched_create(struct amd_sched_backend_ops *ops, -- unsigned ring, unsigned hw_submission) -+ unsigned ring, unsigned hw_submission, -+ void *priv) - { - struct amd_gpu_scheduler *sched; - -@@ -352,6 +353,7 @@ struct amd_gpu_scheduler *amd_sched_create(struct amd_sched_backend_ops *ops, - sched->ops = ops; - sched->ring_id = ring; - sched->hw_submission_limit = hw_submission; -+ sched->priv = priv; - snprintf(sched->name, sizeof(sched->name), "amdgpu[%d]", ring); - amd_sched_rq_init(&sched->sched_rq); - amd_sched_rq_init(&sched->kernel_rq); -diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h -index 0927864..44909b1 100644 ---- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h -+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h -@@ -112,11 +112,12 @@ struct amd_gpu_scheduler { - wait_queue_head_t wait_queue; - uint32_t hw_submission_limit; - char name[20]; -+ void *priv; - }; - - struct amd_gpu_scheduler * - amd_sched_create(struct amd_sched_backend_ops *ops, -- uint32_t ring, uint32_t hw_submission); -+ uint32_t ring, uint32_t hw_submission, void *priv); - int amd_sched_destroy(struct amd_gpu_scheduler *sched); - - int amd_sched_entity_init(struct amd_gpu_scheduler *sched, --- -1.9.1 - |