From: monk.liu <monk.liu@amd.com>
Date: Mon, 25 May 2015 06:44:05 +0000 (+0800)
Subject: drm/amdgpu: fix bug of vm_bo_map (v2)
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ca95261325cfdff85eb2c9107198c714e266cb5b;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

drm/amdgpu: fix bug of vm_bo_map (v2)

call reservation_object_reserve_shared before amdgpu_bo_fence

Signed-off-by: monk.liu <monk.liu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Jammy Zhou <jammy.zhou@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index b25e533fd6e8..cc6dca2581a6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -315,6 +315,10 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,
 	if (r)
 		return r;
 
+	r = reservation_object_reserve_shared(bo->tbo.resv);
+	if (r)
+		return r;
+
 	r = ttm_bo_validate(&bo->tbo, &bo->placement, true, false);
 	if (r)
 		goto error_unreserve;