drm/ttm: drop ttm_buffer_object->resv

All users moved to ttm_buffer_object->base.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-18-kraxel@redhat.com

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 6b8e7851038d15f37390258d5938a07d935f48f4..10a861a1690c92e9704c61dad8972196aa8ffec5 100644 (file)
--- 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 7ffc50a3303d8b2861709ba981fe690ca3ba1300..65ef5376de5950f28011be44475a4dfb5561f557 100644 (file)
--- 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;
 };