diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_gart.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_gart.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c index 43ec4a401f07..d9d31a383276 100644 --- a/drivers/gpu/drm/radeon/radeon_gart.c +++ b/drivers/gpu/drm/radeon/radeon_gart.c | |||
| @@ -466,7 +466,8 @@ int radeon_vm_manager_init(struct radeon_device *rdev) | |||
| 466 | size += rdev->vm_manager.max_pfn * 8; | 466 | size += rdev->vm_manager.max_pfn * 8; |
| 467 | size *= 2; | 467 | size *= 2; |
| 468 | r = radeon_sa_bo_manager_init(rdev, &rdev->vm_manager.sa_manager, | 468 | r = radeon_sa_bo_manager_init(rdev, &rdev->vm_manager.sa_manager, |
| 469 | RADEON_GPU_PAGE_ALIGN(size), | 469 | RADEON_VM_PTB_ALIGN(size), |
| 470 | RADEON_VM_PTB_ALIGN_SIZE, | ||
| 470 | RADEON_GEM_DOMAIN_VRAM); | 471 | RADEON_GEM_DOMAIN_VRAM); |
| 471 | if (r) { | 472 | if (r) { |
| 472 | dev_err(rdev->dev, "failed to allocate vm bo (%dKB)\n", | 473 | dev_err(rdev->dev, "failed to allocate vm bo (%dKB)\n", |
| @@ -620,10 +621,10 @@ int radeon_vm_alloc_pt(struct radeon_device *rdev, struct radeon_vm *vm) | |||
| 620 | } | 621 | } |
| 621 | 622 | ||
| 622 | retry: | 623 | retry: |
| 623 | pd_size = RADEON_GPU_PAGE_ALIGN(radeon_vm_directory_size(rdev)); | 624 | pd_size = RADEON_VM_PTB_ALIGN(radeon_vm_directory_size(rdev)); |
| 624 | r = radeon_sa_bo_new(rdev, &rdev->vm_manager.sa_manager, | 625 | r = radeon_sa_bo_new(rdev, &rdev->vm_manager.sa_manager, |
| 625 | &vm->page_directory, pd_size, | 626 | &vm->page_directory, pd_size, |
| 626 | RADEON_GPU_PAGE_SIZE, false); | 627 | RADEON_VM_PTB_ALIGN_SIZE, false); |
| 627 | if (r == -ENOMEM) { | 628 | if (r == -ENOMEM) { |
| 628 | r = radeon_vm_evict(rdev, vm); | 629 | r = radeon_vm_evict(rdev, vm); |
| 629 | if (r) | 630 | if (r) |
| @@ -952,8 +953,8 @@ static int radeon_vm_update_pdes(struct radeon_device *rdev, | |||
| 952 | retry: | 953 | retry: |
| 953 | r = radeon_sa_bo_new(rdev, &rdev->vm_manager.sa_manager, | 954 | r = radeon_sa_bo_new(rdev, &rdev->vm_manager.sa_manager, |
| 954 | &vm->page_tables[pt_idx], | 955 | &vm->page_tables[pt_idx], |
| 955 | RADEON_VM_PTE_COUNT * 8, | 956 | RADEON_VM_PTB_ALIGN(RADEON_VM_PTE_COUNT * 8), |
| 956 | RADEON_GPU_PAGE_SIZE, false); | 957 | RADEON_VM_PTB_ALIGN_SIZE, false); |
| 957 | 958 | ||
| 958 | if (r == -ENOMEM) { | 959 | if (r == -ENOMEM) { |
| 959 | r = radeon_vm_evict(rdev, vm); | 960 | r = radeon_vm_evict(rdev, vm); |
