Merge branch 'kvm-ppc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_object.h

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
index 9b7b4fcb047bb9cc413d1a5e9934d54f0638de10..a288fa6d72c8026f60a62625f4bf421cc6d3a74e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
@@ -33,6 +33,7 @@
 
 #define AMDGPU_BO_INVALID_OFFSET       LONG_MAX
 
+/* bo virtual addresses in a vm */
 struct amdgpu_bo_va_mapping {
        struct list_head                list;
        struct rb_node                  rb;
@@ -43,26 +44,19 @@ struct amdgpu_bo_va_mapping {
        uint64_t                        flags;
 };
 
-/* bo virtual addresses in a specific vm */
+/* User space allocated BO in a VM */
 struct amdgpu_bo_va {
+       struct amdgpu_vm_bo_base        base;
+
        /* protected by bo being reserved */
-       struct list_head                bo_list;
        struct dma_fence                *last_pt_update;
        unsigned                        ref_count;
 
-       /* protected by vm mutex and spinlock */
-       struct list_head                vm_status;
-
        /* mappings for this bo_va */
        struct list_head                invalids;
        struct list_head                valids;
-
-       /* constant after initialization */
-       struct amdgpu_vm                *vm;
-       struct amdgpu_bo                *bo;
 };
 
-
 struct amdgpu_bo {
        /* Protected by tbo.reserved */
        u32                             preferred_domains;