From: Gerd Hoffmann Date: Mon, 5 Aug 2019 14:01:19 +0000 (+0200) Subject: drm/ttm: drop ttm_buffer_object->resv X-Git-Tag: v5.4-rc1~106^2~18^2~25 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e7f0141a217fa28049d7a3bbc09bee9642c47687;p=linux.git drm/ttm: drop ttm_buffer_object->resv All users moved to ttm_buffer_object->base.resv Signed-off-by: Gerd Hoffmann Reviewed-by: Christian König Link: http://patchwork.freedesktop.org/patch/msgid/20190805140119.7337-18-kraxel@redhat.com --- diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 6b8e7851038d..10a861a1690c 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -1332,11 +1332,9 @@ int ttm_bo_init_reserved(struct ttm_bo_device *bdev, bo->acc_size = acc_size; bo->sg = sg; if (resv) { - bo->resv = resv; bo->base.resv = resv; reservation_object_assert_held(bo->base.resv); } else { - bo->resv = &bo->base._resv; bo->base.resv = &bo->base._resv; } if (!ttm_bo_uses_embedded_gem_object(bo)) { diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h index 7ffc50a3303d..65ef5376de59 100644 --- a/include/drm/ttm/ttm_bo_api.h +++ b/include/drm/ttm/ttm_bo_api.h @@ -230,7 +230,6 @@ struct ttm_buffer_object { struct sg_table *sg; - struct reservation_object *resv; struct mutex wu_mutex; };