From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gerd Hoffmann Subject: [PATCH v2 10/18] drm/ttm: set both resv and base.resv pointers Date: Fri, 21 Jun 2019 13:57:47 +0200 Message-ID: <20190621115755.8481-11-kraxel@redhat.com> References: <20190621115755.8481-1-kraxel@redhat.com> Return-path: In-Reply-To: <20190621115755.8481-1-kraxel@redhat.com> Sender: linux-kernel-owner@vger.kernel.org To: dri-devel@lists.freedesktop.org Cc: ckoenig.leichtzumerken@gmail.com, Gerd Hoffmann , Christian Koenig , Huang Rui , David Airlie , Daniel Vetter , open list List-Id: dri-devel@lists.freedesktop.org Initialize both ttm_buffer_object->resv and ttm_buffer_object->base.resv pointers. This allows to move users from the former to the latter. When all users are moved we can drop ttm_buffer_object->resv. Signed-off-by: Gerd Hoffmann --- drivers/gpu/drm/ttm/ttm_bo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 1d91da85f399..3e605b9ee2f3 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -1331,9 +1331,11 @@ int ttm_bo_init_reserved(struct ttm_bo_device *bdev, bo->sg = sg; if (resv) { bo->resv = resv; + bo->base.resv = resv; reservation_object_assert_held(bo->resv); } else { bo->resv = &bo->base._resv; + bo->base.resv = &bo->base._resv; } if (!ttm_bo_uses_embedded_gem_object(bo)) { /* -- 2.18.1