Merge tag 'amd-drm-next-6.4-2023-03-17' of https://gitlab.freedesktop.org/agd5f/linux...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / amd / amdgpu / amdgpu.h

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index c66706242254a4fa8a417e94d60b49e38be4d112..acb2a2b3851496114d7724334ec394324f41bec5 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -423,29 +423,11 @@ struct amdgpu_clock {
  * alignment).
  */
 
-#define AMDGPU_SA_NUM_FENCE_LISTS      32
-
 struct amdgpu_sa_manager {
-       wait_queue_head_t       wq;
-       struct amdgpu_bo        *bo;
-       struct list_head        *hole;
-       struct list_head        flist[AMDGPU_SA_NUM_FENCE_LISTS];
-       struct list_head        olist;
-       unsigned                size;
-       uint64_t                gpu_addr;
-       void                    *cpu_ptr;
-       uint32_t                domain;
-       uint32_t                align;
-};
-
-/* sub-allocation buffer */
-struct amdgpu_sa_bo {
-       struct list_head                olist;
-       struct list_head                flist;
-       struct amdgpu_sa_manager        *manager;
-       unsigned                        soffset;
-       unsigned                        eoffset;
-       struct dma_fence                *fence;
+       struct drm_suballoc_manager     base;
+       struct amdgpu_bo                *bo;
+       uint64_t                        gpu_addr;
+       void                            *cpu_ptr;
 };
 
 int amdgpu_fence_slab_init(void);