Merge tag 'for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux...

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_vm_cpu.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c
index ac45d9c7a4e946ed5467f554f8fa27b35d0b0999..e3fbf0f10add6ce3513ef8e3f0f42eb5f46abb70 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c
@@ -29,9 +29,9 @@
  *
  * @table: newly allocated or validated PD/PT
  */
-static int amdgpu_vm_cpu_map_table(struct amdgpu_bo *table)
+static int amdgpu_vm_cpu_map_table(struct amdgpu_bo_vm *table)
 {
-       return amdgpu_bo_kmap(table, NULL);
+       return amdgpu_bo_kmap(&table->bo, NULL);
 }
 
 /**
@@ -58,7 +58,7 @@ static int amdgpu_vm_cpu_prepare(struct amdgpu_vm_update_params *p,
  * amdgpu_vm_cpu_update - helper to update page tables via CPU
  *
  * @p: see amdgpu_vm_update_params definition
- * @bo: PD/PT to update
+ * @vmbo: PD/PT to update
  * @pe: byte offset of the PDE/PTE, relative to start of PDB/PTB
  * @addr: dst addr to write into pe
  * @count: number of page entries to update
@@ -68,7 +68,7 @@ static int amdgpu_vm_cpu_prepare(struct amdgpu_vm_update_params *p,
  * Write count number of PT/PD entries directly.
  */
 static int amdgpu_vm_cpu_update(struct amdgpu_vm_update_params *p,
-                               struct amdgpu_bo *bo, uint64_t pe,
+                               struct amdgpu_bo_vm *vmbo, uint64_t pe,
                                uint64_t addr, unsigned count, uint32_t incr,
                                uint64_t flags)
 {
@@ -76,13 +76,13 @@ static int amdgpu_vm_cpu_update(struct amdgpu_vm_update_params *p,
        uint64_t value;
        int r;
 
-       if (bo->tbo.moving) {
-               r = dma_fence_wait(bo->tbo.moving, true);
+       if (vmbo->bo.tbo.moving) {
+               r = dma_fence_wait(vmbo->bo.tbo.moving, true);
                if (r)
                        return r;
        }
 
-       pe += (unsigned long)amdgpu_bo_kptr(bo);
+       pe += (unsigned long)amdgpu_bo_kptr(&vmbo->bo);
 
        trace_amdgpu_vm_set_ptes(pe, addr, count, incr, flags, p->immediate);
 
@@ -110,7 +110,7 @@ static int amdgpu_vm_cpu_commit(struct amdgpu_vm_update_params *p,
 {
        /* Flush HDP */
        mb();
-       amdgpu_asic_flush_hdp(p->adev, NULL);
+       amdgpu_device_flush_hdp(p->adev, NULL);
        return 0;
 }