1 files changed, 8 insertions, 3 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 533b2e7656c0..8a49c3b97bd4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -572,11 +572,16 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,
         INIT_LIST_HEAD(&p->validated);
 
         /* p->bo_list could already be assigned if AMDGPU_CHUNK_ID_BO_HANDLES is present */
-        if (!p->bo_list)
-                p->bo_list = amdgpu_bo_list_get(fpriv, cs->in.bo_list_handle);
-        else
+        if (p->bo_list) {
                 mutex_lock(&p->bo_list->lock);
 
+        } else if (cs->in.bo_list_handle) {
+                r = amdgpu_bo_list_get(fpriv, cs->in.bo_list_handle,
+                                       &p->bo_list);
+                if (r)
+                        return r;
+        }
+
         if (p->bo_list) {
                 amdgpu_bo_list_get_list(p->bo_list, &p->validated);
                 if (p->bo_list->first_userptr != p->bo_list->num_entries)