From: Roger He <Hongbo.He@amd.com>
Date: Thu, 7 Dec 2017 04:51:19 +0000 (+0800)
Subject: drm/ttm: init locked again to prevent incorrect unlock
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5cc636846d23ed817fdda9f00faa56284759d444;p=linux.git

drm/ttm: init locked again to prevent incorrect unlock

Signed-off-by: Roger He <Hongbo.He@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 97c3da6d5f17b..7a9abc2a3a988 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -737,6 +737,7 @@ static int ttm_mem_evict_first(struct ttm_bo_device *bdev,
 								      place)) {
 				if (locked)
 					reservation_object_unlock(bo->resv);
+				locked = false;
 				continue;
 			}
 			break;