From: Monk Liu <monk.liu@amd.com>
Date: Fri, 11 Aug 2017 09:49:48 +0000 (+0800)
Subject: drm/amdgpu: fix wait_any_fence
X-Git-Tag: v4.15-rc1~19^2~56^2~146
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a2138eaf97b4e053b229fe07e1bb4ecbe07e6769;p=linux-block.git

drm/amdgpu: fix wait_any_fence

first is incorrect if hit NULL/signaled fence

Signed-off-by: Monk Liu <monk.liu@amd.com>
Reviewed-by: Chunming Zhou <David1.Zhou@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index b57adc0723cb..233b6f2f8427 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -1384,6 +1384,7 @@ static int amdgpu_cs_wait_any_fence(struct amdgpu_device *adev,
 			array[i] = fence;
 		} else { /* NULL, the fence has been already signaled */
 			r = 1;
+			first = i;
 			goto out;
 		}
 	}