drm/radeon: rework vm_flush parameters

[karo-tx-linux.git] / drivers / gpu / drm / radeon / radeon_vm.c

diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
index 4532cc76a0a66094cd1cff8449f8957dd60152bf..9d0f87be6fa063e350a64192a68f27a9d9a7d9a1 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_vm.c
+++ b/drivers/gpu/drm/radeon/radeon_vm.c
@@ -132,8 +132,8 @@ struct radeon_cs_reloc *radeon_vm_get_bos(struct radeon_device *rdev,
        struct radeon_cs_reloc *list;
        unsigned i, idx;
 
-       list = kmalloc_array(vm->max_pde_used + 2,
-                            sizeof(struct radeon_cs_reloc), GFP_KERNEL);
+       list = drm_malloc_ab(vm->max_pde_used + 2,
+                            sizeof(struct radeon_cs_reloc));
        if (!list)
                return NULL;
 
@@ -243,7 +243,8 @@ void radeon_vm_flush(struct radeon_device *rdev,
        if (!vm->last_flush || pd_addr != vm->pd_gpu_addr) {
                trace_radeon_vm_flush(pd_addr, ring, vm->id);
                vm->pd_gpu_addr = pd_addr;
-               radeon_ring_vm_flush(rdev, ring, vm);
+               radeon_ring_vm_flush(rdev, &rdev->ring[ring],
+                                    vm->id, vm->pd_gpu_addr);
        }
 }