diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0483-drm-amdgpu-remove-some-more-unused-entity-members-v2.patch')
-rw-r--r-- | common/recipes-kernel/linux/files/0483-drm-amdgpu-remove-some-more-unused-entity-members-v2.patch | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/common/recipes-kernel/linux/files/0483-drm-amdgpu-remove-some-more-unused-entity-members-v2.patch b/common/recipes-kernel/linux/files/0483-drm-amdgpu-remove-some-more-unused-entity-members-v2.patch deleted file mode 100644 index dcf0fee3..00000000 --- a/common/recipes-kernel/linux/files/0483-drm-amdgpu-remove-some-more-unused-entity-members-v2.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 9788ec40322ef40d64f6d4276248f40666dc4505 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> -Date: Wed, 19 Aug 2015 17:34:20 +0200 -Subject: [PATCH 0483/1050] drm/amdgpu: remove some more unused entity members - v2 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -None of them are used any more. - -v2: fix type in error message - -Signed-off-by: Christian König <christian.koenig@amd.com> -Reviewed-by: Chunming Zhou <david1.zhou@amd.com> ---- - drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 11 +++-------- - drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 3 --- - 2 files changed, 3 insertions(+), 11 deletions(-) - -diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c -index 981420e..599318d 100644 ---- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c -+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c -@@ -149,11 +149,9 @@ int amd_sched_entity_init(struct amd_gpu_scheduler *sched, - return -EINVAL; - - memset(entity, 0, sizeof(struct amd_sched_entity)); -- spin_lock_init(&entity->lock); - entity->belongto_rq = rq; - entity->scheduler = sched; - init_waitqueue_head(&entity->wait_queue); -- init_waitqueue_head(&entity->wait_emit); - entity->fence_context = fence_context_alloc(1); - snprintf(name, sizeof(name), "c_entity[%llu]", entity->fence_context); - memcpy(entity->name, name, 20); -@@ -228,12 +226,9 @@ int amd_sched_entity_fini(struct amd_gpu_scheduler *sched, - msecs_to_jiffies(AMD_GPU_WAIT_IDLE_TIMEOUT_IN_MS) - ) ? 0 : -1; - -- if (r) { -- if (entity->is_pending) -- DRM_INFO("Entity %p is in waiting state during fini,\ -- all pending ibs will be canceled.\n", -- entity); -- } -+ if (r) -+ DRM_INFO("Entity %p is in waiting state during fini\n", -+ entity); - - amd_sched_rq_remove_entity(rq, entity); - kfifo_free(&entity->job_queue); -diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h -index 81c00da..bbfcc37 100644 ---- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h -+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h -@@ -41,15 +41,12 @@ struct amd_sched_rq; - struct amd_sched_entity { - struct list_head list; - struct amd_sched_rq *belongto_rq; -- spinlock_t lock; - atomic_t fence_seq; - /* the job_queue maintains the jobs submitted by clients */ - struct kfifo job_queue; - spinlock_t queue_lock; - struct amd_gpu_scheduler *scheduler; - wait_queue_head_t wait_queue; -- wait_queue_head_t wait_emit; -- bool is_pending; - uint64_t fence_context; - char name[20]; - bool need_wakeup; --- -1.9.1 - |