1 From d7c5782acd354bdb5ed0fa10e1e397eaed558390 Mon Sep 17 00:00:00 2001
2 From: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
3 Date: Tue, 29 Oct 2019 11:03:05 -0400
4 Subject: [PATCH] drm/sched: Fix passing zero to 'PTR_ERR' warning v2
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
9 Fix a static code checker warning.
11 v2: Drop PTR_ERR_OR_ZERO.
13 Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
14 Reviewed-by: Emily Deng <Emily.Deng@amd.com>
15 Reviewed-by: Christian König <christian.koenig@amd.com>
16 Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
18 drivers/gpu/drm/scheduler/sched_main.c | 7 +++++--
19 1 file changed, 5 insertions(+), 2 deletions(-)
21 diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c
22 index 2af64459b3d7..fbb6446c4f69 100644
23 --- a/drivers/gpu/drm/scheduler/sched_main.c
24 +++ b/drivers/gpu/drm/scheduler/sched_main.c
25 @@ -496,8 +496,10 @@ void drm_sched_resubmit_jobs(struct drm_gpu_scheduler *sched)
26 fence = sched->ops->run_job(s_job);
28 if (IS_ERR_OR_NULL(fence)) {
30 + dma_fence_set_error(&s_fence->finished, PTR_ERR(fence));
32 s_job->s_fence->parent = NULL;
33 - dma_fence_set_error(&s_fence->finished, PTR_ERR(fence));
35 s_job->s_fence->parent = fence;
37 @@ -746,8 +748,9 @@ static int drm_sched_main(void *param)
42 + dma_fence_set_error(&s_fence->finished, PTR_ERR(fence));
44 - dma_fence_set_error(&s_fence->finished, PTR_ERR(fence));
45 drm_sched_process_job(NULL, &sched_job->cb);