diff options
Diffstat (limited to 'meta-amdfalconx86/recipes-kernel/linux/linux-yocto/0437-drm-amdgpu-fix-coding-style-in-a-couple-of-places.patch')
| -rw-r--r-- | meta-amdfalconx86/recipes-kernel/linux/linux-yocto/0437-drm-amdgpu-fix-coding-style-in-a-couple-of-places.patch | 112 |
1 files changed, 112 insertions, 0 deletions
diff --git a/meta-amdfalconx86/recipes-kernel/linux/linux-yocto/0437-drm-amdgpu-fix-coding-style-in-a-couple-of-places.patch b/meta-amdfalconx86/recipes-kernel/linux/linux-yocto/0437-drm-amdgpu-fix-coding-style-in-a-couple-of-places.patch new file mode 100644 index 00000000..c067f815 --- /dev/null +++ b/meta-amdfalconx86/recipes-kernel/linux/linux-yocto/0437-drm-amdgpu-fix-coding-style-in-a-couple-of-places.patch @@ -0,0 +1,112 @@ +From 4cd7f42cf8f57512b13a13bb7dcbeabb644f5264 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:18:52 +0200 +Subject: [PATCH 0437/1050] drm/amdgpu: fix coding style in a couple of places +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_cs.c | 6 ++---- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 17 ++++++++++------- + 2 files changed, 12 insertions(+), 11 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +index f72a858..d26688d 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +@@ -528,15 +528,13 @@ static void amdgpu_cs_parser_fini(struct amdgpu_cs_parser *parser, int error, bo + amdgpu_cs_parser_fini_late(parser); + } + +-static int amdgpu_cs_parser_run_job( +- struct amdgpu_cs_parser *sched_job) ++static int amdgpu_cs_parser_run_job(struct amdgpu_cs_parser *sched_job) + { + amdgpu_cs_parser_fini_early(sched_job, 0, true); + return 0; + } + +-static int amdgpu_cs_parser_free_job( +- struct amdgpu_cs_parser *sched_job) ++static int amdgpu_cs_parser_free_job(struct amdgpu_cs_parser *sched_job) + { + amdgpu_cs_parser_fini_late(sched_job); + return 0; +diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +index 6f0d40b..1f78ad6 100644 +--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c ++++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +@@ -64,6 +64,7 @@ static struct amd_sched_entity *rq_select_entity(struct amd_run_queue *rq) + { + struct amd_sched_entity *p = rq->current_entity; + int i = atomic_read(&rq->nr_entity) + 1; /*real count + dummy head*/ ++ + while (i) { + p = list_entry(p->list.next, typeof(*p), list); + if (!rq->check_entity_status(p)) { +@@ -83,7 +84,7 @@ static bool context_entity_is_waiting(struct amd_context_entity *entity) + + static int gpu_entity_check_status(struct amd_sched_entity *entity) + { +- struct amd_context_entity *tmp = NULL; ++ struct amd_context_entity *tmp; + + if (entity == &entity->belongto_rq->head) + return -1; +@@ -109,6 +110,7 @@ static bool is_scheduler_ready(struct amd_gpu_scheduler *sched) + { + unsigned long flags; + bool full; ++ + spin_lock_irqsave(&sched->queue_lock, flags); + full = atomic64_read(&sched->hw_rq_count) < + sched->hw_submission_limit ? true : false; +@@ -121,10 +123,10 @@ static bool is_scheduler_ready(struct amd_gpu_scheduler *sched) + * Select next entity from the kernel run queue, if not available, + * return null. + */ +-static struct amd_context_entity *kernel_rq_select_context( +- struct amd_gpu_scheduler *sched) ++static struct amd_context_entity * ++kernel_rq_select_context(struct amd_gpu_scheduler *sched) + { +- struct amd_sched_entity *sched_entity = NULL; ++ struct amd_sched_entity *sched_entity; + struct amd_context_entity *tmp = NULL; + struct amd_run_queue *rq = &sched->kernel_rq; + +@@ -141,8 +143,8 @@ static struct amd_context_entity *kernel_rq_select_context( + /** + * Select next entity containing real IB submissions + */ +-static struct amd_context_entity *select_context( +- struct amd_gpu_scheduler *sched) ++static struct amd_context_entity * ++select_context(struct amd_gpu_scheduler *sched) + { + struct amd_context_entity *wake_entity = NULL; + struct amd_context_entity *tmp; +@@ -413,6 +415,7 @@ void amd_sched_process_job(struct amd_sched_job *sched_job) + { + unsigned long flags; + struct amd_gpu_scheduler *sched; ++ + if (!sched_job) + return; + sched = sched_job->sched; +@@ -445,7 +448,7 @@ struct amd_gpu_scheduler *amd_sched_create(void *device, + unsigned hw_submission) + { + struct amd_gpu_scheduler *sched; +- char name[20] = "gpu_sched[0]"; ++ char name[20]; + + sched = kzalloc(sizeof(struct amd_gpu_scheduler), GFP_KERNEL); + if (!sched) +-- +1.9.1 + |