[CI v2 20/21] drm/ttm: Use drm_exec_trylock for bo initialization

["Thomas Hellström" <thomas.hellstrom@linux.intel.com>]

Buffer object initialization may be part of a drm_exec transaction.
Rather than using dma_resv_trylock, use drm_exec_trylock_obj().

Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
---
 drivers/gpu/drm/ttm/ttm_bo.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 3f1247fc657d..ed67c3b4a6a3 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -919,7 +919,10 @@ int ttm_bo_init_reserved(struct ttm_device *bdev, struct ttm_buffer_object *bo,
 	 * since otherwise lockdep will be angered in radeon.
 	 */
 	if (!resv)
-		WARN_ON(!dma_resv_trylock(bo->base.resv));
+		if (ctx->exec)
+			WARN_ON(drm_exec_trylock_obj(ctx->exec, &bo->base));
+		else
+			WARN_ON(!dma_resv_trylock(bo->base.resv));
 	else
 		dma_resv_assert_held(resv);
 
@@ -930,8 +933,12 @@ int ttm_bo_init_reserved(struct ttm_device *bdev, struct ttm_buffer_object *bo,
 	return 0;
 
 err_unlock:
-	if (!resv)
-		dma_resv_unlock(bo->base.resv);
+	if (!resv) {
+		if (ctx->exec)
+			drm_exec_unlock_obj(ctx->exec, &bo->base);
+		else
+			dma_resv_unlock(bo->base.resv);
+	}
 
 err_put:
 	ttm_bo_put(bo);
-- 
2.44.0