Browse Source

drm/amdgpu: Fix null pointer issue in amdgpu_cs_wait_any_fence

The array[first] may be null when the fence has already been signaled.

BUG: SWDEV-136239

Signed-off-by: Emily Deng <Emily.Deng@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Emily Deng 7 years ago
parent
commit
cdadab89f8
1 changed files with 5 additions and 2 deletions
  1. 5 2
      drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

+ 5 - 2
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

@@ -1497,8 +1497,11 @@ out:
 	memset(wait, 0, sizeof(*wait));
 	wait->out.status = (r > 0);
 	wait->out.first_signaled = first;
-	/* set return value 0 to indicate success */
-	r = array[first]->error;
+
+	if (array[first])
+		r = array[first]->error;
+	else
+		r = 0;
 
 err_free_fence_array:
 	for (i = 0; i < fence_count; i++)