aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2019-08-05 10:01:11 -0400
committerGerd Hoffmann <kraxel@redhat.com>2019-08-06 02:21:54 -0400
commit2e3c9ec4d151c04d75546dfdc2f85a84ad546eb0 (patch)
tree5ba9fb5c312e7e58905eae03468197c3917a943f
parentb96f3e7c8069b749a40ca3a33c97835d57dd45d2 (diff)
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 <kraxel@redhat.com> Reviewed-by: Christian König <christian.koenig@amd.com> Link: http://patchwork.freedesktop.org/patch/msgid/20190805140119.7337-10-kraxel@redhat.com
-rw-r--r--drivers/gpu/drm/ttm/ttm_bo.c2
1 files changed, 2 insertions, 0 deletions
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,
1333 bo->sg = sg; 1333 bo->sg = sg;
1334 if (resv) { 1334 if (resv) {
1335 bo->resv = resv; 1335 bo->resv = resv;
1336 bo->base.resv = resv;
1336 reservation_object_assert_held(bo->resv); 1337 reservation_object_assert_held(bo->resv);
1337 } else { 1338 } else {
1338 bo->resv = &bo->base._resv; 1339 bo->resv = &bo->base._resv;
1340 bo->base.resv = &bo->base._resv;
1339 } 1341 }
1340 if (!ttm_bo_uses_embedded_gem_object(bo)) { 1342 if (!ttm_bo_uses_embedded_gem_object(bo)) {
1341 /* 1343 /*