drm/radeon: remove vm_manager start/suspend

[linux-2.6-block.git] / drivers / gpu / drm / radeon / radeon_gart.c

diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c
index ee11c5073726e59a8d89fb4125325352d4499655..56752da4b81622e68d2b7a37342aa9bf717be439 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_gart.c
+++ b/drivers/gpu/drm/radeon/radeon_gart.c
@@ -282,27 +282,58 @@ void radeon_gart_fini(struct radeon_device *rdev)
  *
  * TODO bind a default page at vm initialization for default address
  */
+
 int radeon_vm_manager_init(struct radeon_device *rdev)
 {
+       struct radeon_vm *vm;
+       struct radeon_bo_va *bo_va;
        int r;
 
-       rdev->vm_manager.enabled = false;
+       if (!rdev->vm_manager.enabled) {
+               /* mark first vm as always in use, it's the system one */
+               r = radeon_sa_bo_manager_init(rdev, &rdev->vm_manager.sa_manager,
+                                             rdev->vm_manager.max_pfn * 8,
+                                             RADEON_GEM_DOMAIN_VRAM);
+               if (r) {
+                       dev_err(rdev->dev, "failed to allocate vm bo (%dKB)\n",
+                               (rdev->vm_manager.max_pfn * 8) >> 10);
+                       return r;
+               }
 
-       /* mark first vm as always in use, it's the system one */
-       r = radeon_sa_bo_manager_init(rdev, &rdev->vm_manager.sa_manager,
-                                     rdev->vm_manager.max_pfn * 8,
-                                     RADEON_GEM_DOMAIN_VRAM);
-       if (r) {
-               dev_err(rdev->dev, "failed to allocate vm bo (%dKB)\n",
-                       (rdev->vm_manager.max_pfn * 8) >> 10);
-               return r;
+               r = rdev->vm_manager.funcs->init(rdev);
+               if (r)
+                       return r;
+       
+               rdev->vm_manager.enabled = true;
+
+               r = radeon_sa_bo_manager_start(rdev, &rdev->vm_manager.sa_manager);
+               if (r)
+                       return r;
        }
 
-       r = rdev->vm_manager.funcs->init(rdev);
-       if (r == 0)
-               rdev->vm_manager.enabled = true;
+       /* restore page table */
+       list_for_each_entry(vm, &rdev->vm_manager.lru_vm, list) {
+               if (vm->id == -1)
+                       continue;
 
-       return r;
+               list_for_each_entry(bo_va, &vm->va, vm_list) {
+                       struct ttm_mem_reg *mem = NULL;
+                       if (bo_va->valid)
+                               mem = &bo_va->bo->tbo.mem;
+
+                       bo_va->valid = false;
+                       r = radeon_vm_bo_update_pte(rdev, vm, bo_va->bo, mem);
+                       if (r) {
+                               DRM_ERROR("Failed to update pte for vm %d!\n", vm->id);
+                       }
+               }
+
+               r = rdev->vm_manager.funcs->bind(rdev, vm, vm->id);
+               if (r) {
+                       DRM_ERROR("Failed to bind vm %d!\n", vm->id);
+               }
+       }
+       return 0;
 }
 
 /* global mutex must be lock */
@@ -346,27 +377,12 @@ static void radeon_vm_unbind_locked(struct radeon_device *rdev,
 }
 
 void radeon_vm_manager_fini(struct radeon_device *rdev)
-{
-       if (rdev->vm_manager.sa_manager.bo == NULL)
-               return;
-       radeon_vm_manager_suspend(rdev);
-       rdev->vm_manager.funcs->fini(rdev);
-       radeon_sa_bo_manager_fini(rdev, &rdev->vm_manager.sa_manager);
-       rdev->vm_manager.enabled = false;
-}
-
-int radeon_vm_manager_start(struct radeon_device *rdev)
-{
-       if (rdev->vm_manager.sa_manager.bo == NULL) {
-               return -EINVAL;
-       }
-       return radeon_sa_bo_manager_start(rdev, &rdev->vm_manager.sa_manager);
-}
-
-int radeon_vm_manager_suspend(struct radeon_device *rdev)
 {
        struct radeon_vm *vm, *tmp;
 
+       if (!rdev->vm_manager.enabled)
+               return;
+
        mutex_lock(&rdev->vm_manager.lock);
        /* unbind all active vm */
        list_for_each_entry_safe(vm, tmp, &rdev->vm_manager.lru_vm, list) {
@@ -374,7 +390,10 @@ int radeon_vm_manager_suspend(struct radeon_device *rdev)
        }
        rdev->vm_manager.funcs->fini(rdev);
        mutex_unlock(&rdev->vm_manager.lock);
-       return radeon_sa_bo_manager_suspend(rdev, &rdev->vm_manager.sa_manager);
+
+       radeon_sa_bo_manager_suspend(rdev, &rdev->vm_manager.sa_manager);
+       radeon_sa_bo_manager_fini(rdev, &rdev->vm_manager.sa_manager);
+       rdev->vm_manager.enabled = false;
 }
 
 /* global mutex must be locked */