diff mbox

[44/88] drm/amdgpu: fix bug occurs when bo_list is NULL

Message ID 1432696827-3752-14-git-send-email-alexander.deucher@amd.com (mailing list archive)
State New, archived
Headers show

Commit Message

Alex Deucher May 27, 2015, 3:19 a.m. UTC 
From: "monk.liu" <monk.liu@amd.com>

Still need to handle ibs BO and validate them even bo_list is NULL

Signed-off-by: Monk.Liu <monk.liu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
diff mbox

Patch

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 70a9031..ffbe9aa 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -353,19 +353,19 @@  static int amdgpu_cs_parser_relocs(struct amdgpu_cs_parser *p)
 {
 	struct amdgpu_fpriv *fpriv = p->filp->driver_priv;
 	struct amdgpu_cs_buckets buckets;
-	bool need_mmap_lock;
+	bool need_mmap_lock = false;
 	int i, r;
 
-	if (p->bo_list == NULL)
-		return 0;
+	if (p->bo_list) {
+		need_mmap_lock = p->bo_list->has_userptr;
+		amdgpu_cs_buckets_init(&buckets);
+		for (i = 0; i < p->bo_list->num_entries; i++)
+			amdgpu_cs_buckets_add(&buckets, &p->bo_list->array[i].tv.head,
+								  p->bo_list->array[i].priority);
 
-	need_mmap_lock = p->bo_list->has_userptr;
-	amdgpu_cs_buckets_init(&buckets);
-	for (i = 0; i < p->bo_list->num_entries; i++)
-		amdgpu_cs_buckets_add(&buckets, &p->bo_list->array[i].tv.head,
-					      p->bo_list->array[i].priority);
+		amdgpu_cs_buckets_get_list(&buckets, &p->validated);
+	}
 
-	amdgpu_cs_buckets_get_list(&buckets, &p->validated);
 	p->vm_bos = amdgpu_vm_get_bos(p->adev, &fpriv->vm,
 				      &p->validated);