aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0550-drm-amdgpu-rename-fence-scheduler-to-sched-v2.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0550-drm-amdgpu-rename-fence-scheduler-to-sched-v2.patch')
-rw-r--r--common/recipes-kernel/linux/files/0550-drm-amdgpu-rename-fence-scheduler-to-sched-v2.patch221
1 files changed, 0 insertions, 221 deletions
diff --git a/common/recipes-kernel/linux/files/0550-drm-amdgpu-rename-fence-scheduler-to-sched-v2.patch b/common/recipes-kernel/linux/files/0550-drm-amdgpu-rename-fence-scheduler-to-sched-v2.patch
deleted file mode 100644
index 96528110..00000000
--- a/common/recipes-kernel/linux/files/0550-drm-amdgpu-rename-fence-scheduler-to-sched-v2.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From 9b398fa5c24eb05fc60fafd8543cc03e9170f054 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
-Date: Mon, 7 Sep 2015 18:16:49 +0200
-Subject: [PATCH 0550/1050] drm/amdgpu: rename fence->scheduler to sched v2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Just to be consistent with the other members.
-
-v2: rename the ring member as well.
-
-Signed-off-by: Christian König <christian.koenig@amd.com>
-Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com> (v1)
-Reviewed-by: Chunming Zhou<david1.zhou@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +-
- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +-
- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 10 +++++-----
- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 14 +++++++-------
- drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 4 ++--
- drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 2 +-
- drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 2 +-
- drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 2 +-
- drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 2 +-
- drivers/gpu/drm/amd/scheduler/sched_fence.c | 4 ++--
- 10 files changed, 22 insertions(+), 22 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-index dbe061b..9108b7c 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-@@ -891,7 +891,7 @@ struct amdgpu_ring {
- struct amdgpu_device *adev;
- const struct amdgpu_ring_funcs *funcs;
- struct amdgpu_fence_driver fence_drv;
-- struct amd_gpu_scheduler *scheduler;
-+ struct amd_gpu_scheduler *sched;
-
- spinlock_t fence_lock;
- struct mutex *ring_lock;
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
-index 546968a..6f39b2d 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
-@@ -848,7 +848,7 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
- job = kzalloc(sizeof(struct amdgpu_job), GFP_KERNEL);
- if (!job)
- return -ENOMEM;
-- job->base.sched = ring->scheduler;
-+ job->base.sched = ring->sched;
- job->base.s_entity = &parser->ctx->rings[ring->idx].entity;
- job->adev = parser->adev;
- job->ibs = parser->ibs;
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
-index 20cbc4e..5494831 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
-@@ -43,10 +43,10 @@ int amdgpu_ctx_init(struct amdgpu_device *adev, bool kernel,
- for (i = 0; i < adev->num_rings; i++) {
- struct amd_sched_rq *rq;
- if (kernel)
-- rq = &adev->rings[i]->scheduler->kernel_rq;
-+ rq = &adev->rings[i]->sched->kernel_rq;
- else
-- rq = &adev->rings[i]->scheduler->sched_rq;
-- r = amd_sched_entity_init(adev->rings[i]->scheduler,
-+ rq = &adev->rings[i]->sched->sched_rq;
-+ r = amd_sched_entity_init(adev->rings[i]->sched,
- &ctx->rings[i].entity,
- rq, amdgpu_sched_jobs);
- if (r)
-@@ -55,7 +55,7 @@ int amdgpu_ctx_init(struct amdgpu_device *adev, bool kernel,
-
- if (i < adev->num_rings) {
- for (j = 0; j < i; j++)
-- amd_sched_entity_fini(adev->rings[j]->scheduler,
-+ amd_sched_entity_fini(adev->rings[j]->sched,
- &ctx->rings[j].entity);
- kfree(ctx);
- return r;
-@@ -75,7 +75,7 @@ void amdgpu_ctx_fini(struct amdgpu_ctx *ctx)
-
- if (amdgpu_enable_scheduler) {
- for (i = 0; i < adev->num_rings; i++)
-- amd_sched_entity_fini(adev->rings[i]->scheduler,
-+ amd_sched_entity_fini(adev->rings[i]->sched,
- &ctx->rings[i].entity);
- }
- }
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
-index 1be2bd6..8e8cd09 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
-@@ -626,11 +626,11 @@ void amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring)
- ring->fence_drv.ring = ring;
-
- if (amdgpu_enable_scheduler) {
-- ring->scheduler = amd_sched_create(&amdgpu_sched_ops,
-- ring->idx,
-- amdgpu_sched_hw_submission,
-- (void *)ring->adev);
-- if (!ring->scheduler)
-+ ring->sched = amd_sched_create(&amdgpu_sched_ops,
-+ ring->idx,
-+ amdgpu_sched_hw_submission,
-+ (void *)ring->adev);
-+ if (!ring->sched)
- DRM_ERROR("Failed to create scheduler on ring %d.\n",
- ring->idx);
- }
-@@ -681,8 +681,8 @@ void amdgpu_fence_driver_fini(struct amdgpu_device *adev)
- wake_up_all(&ring->fence_drv.fence_queue);
- amdgpu_irq_put(adev, ring->fence_drv.irq_src,
- ring->fence_drv.irq_type);
-- if (ring->scheduler)
-- amd_sched_destroy(ring->scheduler);
-+ if (ring->sched)
-+ amd_sched_destroy(ring->sched);
- ring->fence_drv.initialized = false;
- }
- mutex_unlock(&adev->ring_lock);
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
-index b70ce10..7cf5405 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
-@@ -146,7 +146,7 @@ static uint32_t amdgpu_sa_get_ring_from_fence(struct fence *f)
-
- s_fence = to_amd_sched_fence(f);
- if (s_fence)
-- return s_fence->scheduler->ring_id;
-+ return s_fence->sched->ring_id;
- a_fence = to_amdgpu_fence(f);
- if (a_fence)
- return a_fence->ring->idx;
-@@ -437,7 +437,7 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,
- if (s_fence)
- seq_printf(m, " protected by 0x%016x on ring %d",
- s_fence->base.seqno,
-- s_fence->scheduler->ring_id);
-+ s_fence->sched->ring_id);
-
- }
- seq_printf(m, "\n");
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
-index 58408da..d1984fc 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
-@@ -85,7 +85,7 @@ int amdgpu_sched_ib_submit_kernel_helper(struct amdgpu_device *adev,
- kzalloc(sizeof(struct amdgpu_job), GFP_KERNEL);
- if (!job)
- return -ENOMEM;
-- job->base.sched = ring->scheduler;
-+ job->base.sched = ring->sched;
- job->base.s_entity = &adev->kernel_ctx.rings[ring->idx].entity;
- job->adev = adev;
- job->ibs = ibs;
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
-index cfd2999..b57ca10 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
-@@ -66,7 +66,7 @@ static bool amdgpu_sync_same_dev(struct amdgpu_device *adev, struct fence *f)
- if (a_fence)
- return a_fence->ring->adev == adev;
- if (s_fence)
-- return (struct amdgpu_device *)s_fence->scheduler->priv == adev;
-+ return (struct amdgpu_device *)s_fence->sched->priv == adev;
- return false;
- }
-
-diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
-index a9d5826..ec4842e 100644
---- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
-+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
-@@ -326,7 +326,7 @@ static void amd_sched_process_job(struct fence *f, struct fence_cb *cb)
- {
- struct amd_sched_fence *s_fence =
- container_of(cb, struct amd_sched_fence, cb);
-- struct amd_gpu_scheduler *sched = s_fence->scheduler;
-+ struct amd_gpu_scheduler *sched = s_fence->sched;
-
- atomic_dec(&sched->hw_rq_count);
- amd_sched_fence_signal(s_fence);
-diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
-index c4fe24e..89d977d 100644
---- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
-+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
-@@ -65,7 +65,7 @@ struct amd_sched_rq {
- struct amd_sched_fence {
- struct fence base;
- struct fence_cb cb;
-- struct amd_gpu_scheduler *scheduler;
-+ struct amd_gpu_scheduler *sched;
- spinlock_t lock;
- void *owner;
- };
-diff --git a/drivers/gpu/drm/amd/scheduler/sched_fence.c b/drivers/gpu/drm/amd/scheduler/sched_fence.c
-index 733522f..d802638 100644
---- a/drivers/gpu/drm/amd/scheduler/sched_fence.c
-+++ b/drivers/gpu/drm/amd/scheduler/sched_fence.c
-@@ -36,7 +36,7 @@ struct amd_sched_fence *amd_sched_fence_create(struct amd_sched_entity *s_entity
- if (fence == NULL)
- return NULL;
- fence->owner = owner;
-- fence->scheduler = s_entity->sched;
-+ fence->sched = s_entity->sched;
- spin_lock_init(&fence->lock);
-
- seq = atomic_inc_return(&s_entity->fence_seq);
-@@ -63,7 +63,7 @@ static const char *amd_sched_fence_get_driver_name(struct fence *fence)
- static const char *amd_sched_fence_get_timeline_name(struct fence *f)
- {
- struct amd_sched_fence *fence = to_amd_sched_fence(f);
-- return (const char *)fence->scheduler->name;
-+ return (const char *)fence->sched->name;
- }
-
- static bool amd_sched_fence_enable_signaling(struct fence *f)
---
-1.9.1
-
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-27 02:59:26 +0000