From: Gerd Hoffmann Date: Mon, 5 Aug 2019 14:01:11 +0000 (+0200) Subject: drm/ttm: set both resv and base.resv pointers X-Git-Tag: v5.4-rc1~106^2~18^2~33 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=2e3c9ec4d151c04d75546dfdc2f85a84ad546eb0;p=linux.git drm/ttm: set both resv and base.resv pointers 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 Reviewed-by: Christian König Link: http://patchwork.freedesktop.org/patch/msgid/20190805140119.7337-10-kraxel@redhat.com --- diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 3e0a0cbc410e..ce1e6221e7ea 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -1333,9 +1333,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)) { /*