diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/1275-drm-scheduler-Simplify-spsc_queue_count-check-in-drm.patch')
-rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/1275-drm-scheduler-Simplify-spsc_queue_count-check-in-drm.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/1275-drm-scheduler-Simplify-spsc_queue_count-check-in-drm.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/1275-drm-scheduler-Simplify-spsc_queue_count-check-in-drm.patch new file mode 100644 index 00000000..e90296fe --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/1275-drm-scheduler-Simplify-spsc_queue_count-check-in-drm.patch @@ -0,0 +1,69 @@ +From bbc9bce319ef971d0c88222a029b6d17a0e1dddb Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor <natechancellor@gmail.com> +Date: Mon, 1 Oct 2018 23:41:24 -0700 +Subject: [PATCH 1275/2940] drm/scheduler: Simplify spsc_queue_count check in + drm_sched_entity_select_rq +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Clang generates a warning when it sees a logical not followed by a +conditional operator like ==, >, or <. + +drivers/gpu/drm/scheduler/sched_entity.c:470:6: warning: logical not is +only applied to the left hand side of this comparison +[-Wlogical-not-parentheses] + if (!spsc_queue_count(&entity->job_queue) == 0 || + ^ ~~ +drivers/gpu/drm/scheduler/sched_entity.c:470:6: note: add parentheses +after the '!' to evaluate the comparison first + if (!spsc_queue_count(&entity->job_queue) == 0 || + ^ + ( ) +drivers/gpu/drm/scheduler/sched_entity.c:470:6: note: add parentheses +around left hand side expression to silence this warning + if (!spsc_queue_count(&entity->job_queue) == 0 || + ^ + ( ) +1 warning generated. + +It assumes the author might have made a mistake in their logic: + +if (!a == b) -> if (!(a == b)) + +Sometimes that is the case; other times, it's just a super convoluted +way of saying 'if (a)' when b = 0: + +if (!1 == 0) -> if (0 == 0) -> if (true) + +Alternatively: + +if (!1 == 0) -> if (!!1) -> if (1) + +Simplify this comparison so that Clang doesn't complain. + +Fixes: 35e160e781a0 ("drm/scheduler: change entities rq even earlier") +Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> +Reviewed-by: Christian König <christian.koenig@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/scheduler/sched_entity.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c +index 26db90635a7d..4463d3826ecb 100644 +--- a/drivers/gpu/drm/scheduler/sched_entity.c ++++ b/drivers/gpu/drm/scheduler/sched_entity.c +@@ -473,8 +473,7 @@ void drm_sched_entity_select_rq(struct drm_sched_entity *entity) + struct dma_fence *fence; + struct drm_sched_rq *rq; + +- if (!spsc_queue_count(&entity->job_queue) == 0 || +- entity->num_rq_list <= 1) ++ if (spsc_queue_count(&entity->job_queue) || entity->num_rq_list <= 1) + return; + + fence = READ_ONCE(entity->last_scheduled); +-- +2.17.1 + |