Merge tag 'v5.3-rc7' into x86/mm, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 19 insertions, 16 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index e069de8b54e6..8b26c970a3cb 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -1044,29 +1044,27 @@ static int amdgpu_cs_process_fence_dep(struct amdgpu_cs_parser *p,
                         return r;
                 }
 
-                fence = amdgpu_ctx_get_fence(ctx, entity,
-                                             deps[i].handle);
+                fence = amdgpu_ctx_get_fence(ctx, entity, deps[i].handle);
+                amdgpu_ctx_put(ctx);
+
+                if (IS_ERR(fence))
+                        return PTR_ERR(fence);
+                else if (!fence)
+                        continue;
 
                 if (chunk->chunk_id == AMDGPU_CHUNK_ID_SCHEDULED_DEPENDENCIES) {
-                        struct drm_sched_fence *s_fence = to_drm_sched_fence(fence);
+                        struct drm_sched_fence *s_fence;
                         struct dma_fence *old = fence;
 
+                        s_fence = to_drm_sched_fence(fence);
                         fence = dma_fence_get(&s_fence->scheduled);
                         dma_fence_put(old);
                 }
 
-                if (IS_ERR(fence)) {
-                        r = PTR_ERR(fence);
-                        amdgpu_ctx_put(ctx);
+                r = amdgpu_sync_fence(p->adev, &p->job->sync, fence, true);
+                dma_fence_put(fence);
+                if (r)
                         return r;
-                } else if (fence) {
-                        r = amdgpu_sync_fence(p->adev, &p->job->sync, fence,
-                                        true);
-                        dma_fence_put(fence);
-                        amdgpu_ctx_put(ctx);
-                        if (r)
-                                return r;
-                }
         }
         return 0;
 }
@@ -1145,6 +1143,9 @@ static int amdgpu_cs_process_syncobj_out_dep(struct amdgpu_cs_parser *p,
         num_deps = chunk->length_dw * 4 /
                 sizeof(struct drm_amdgpu_cs_chunk_sem);
 
+        if (p->post_deps)
+                return -EINVAL;
+
         p->post_deps = kmalloc_array(num_deps, sizeof(*p->post_deps),
                                      GFP_KERNEL);
         p->num_post_deps = 0;
@@ -1168,8 +1169,7 @@ static int amdgpu_cs_process_syncobj_out_dep(struct amdgpu_cs_parser *p,
 
 
 static int amdgpu_cs_process_syncobj_timeline_out_dep(struct amdgpu_cs_parser *p,
-                                                      struct amdgpu_cs_chunk
-                                                      *chunk)
+                                                      struct amdgpu_cs_chunk *chunk)
 {
         struct drm_amdgpu_cs_chunk_syncobj *syncobj_deps;
         unsigned num_deps;
@@ -1179,6 +1179,9 @@ static int amdgpu_cs_process_syncobj_timeline_out_dep(struct amdgpu_cs_parser *p
         num_deps = chunk->length_dw * 4 /
                 sizeof(struct drm_amdgpu_cs_chunk_syncobj);
 
+        if (p->post_deps)
+                return -EINVAL;
+
         p->post_deps = kmalloc_array(num_deps, sizeof(*p->post_deps),
                                      GFP_KERNEL);
         p->num_post_deps = 0;