1 files changed, 4 insertions, 21 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
index 18945dd6982d..7d3312d0da11 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
@@ -89,8 +89,8 @@ struct amdgpu_bo {
         void                            *metadata;
         u32                             metadata_size;
         unsigned                        prime_shared_count;
-        /* list of all virtual address to which this bo is associated to */
-        struct list_head                va;
+        /* per VM structure for page tables and with virtual addresses */
+        struct amdgpu_vm_bo_base        *vm_bo;
         /* Constant after initialization */
         struct drm_gem_object           gem_base;
         struct amdgpu_bo                *parent;
@@ -194,19 +194,6 @@ static inline u64 amdgpu_bo_mmap_offset(struct amdgpu_bo *bo)
 }
 
 /**
- * amdgpu_bo_gpu_accessible - return whether the bo is currently in memory that
- * is accessible to the GPU.
- */
-static inline bool amdgpu_bo_gpu_accessible(struct amdgpu_bo *bo)
-{
-        switch (bo->tbo.mem.mem_type) {
-        case TTM_PL_TT: return amdgpu_gtt_mgr_has_gart_addr(&bo->tbo.mem);
-        case TTM_PL_VRAM: return true;
-        default: return false;
-        }
-}
-
-/**
  * amdgpu_bo_in_cpu_visible_vram - check if BO is (partly) in visible VRAM
  */
 static inline bool amdgpu_bo_in_cpu_visible_vram(struct amdgpu_bo *bo)
@@ -286,12 +273,8 @@ int amdgpu_bo_backup_to_shadow(struct amdgpu_device *adev,
                                struct reservation_object *resv,
                                struct dma_fence **fence, bool direct);
 int amdgpu_bo_validate(struct amdgpu_bo *bo);
-int amdgpu_bo_restore_from_shadow(struct amdgpu_device *adev,
-                                  struct amdgpu_ring *ring,
-                                  struct amdgpu_bo *bo,
-                                  struct reservation_object *resv,
-                                  struct dma_fence **fence,
-                                  bool direct);
+int amdgpu_bo_restore_shadow(struct amdgpu_bo *shadow,
+                             struct dma_fence **fence);
 uint32_t amdgpu_bo_get_preferred_pin_domain(struct amdgpu_device *adev,
                                             uint32_t domain);