|
@@ -907,17 +907,17 @@ int radeon_ttm_init(struct radeon_device *rdev)
|
|
|
|
|
|
r = radeon_bo_create(rdev, 256 * 1024, PAGE_SIZE, true,
|
|
|
RADEON_GEM_DOMAIN_VRAM, 0, NULL,
|
|
|
- NULL, &rdev->stollen_vga_memory);
|
|
|
+ NULL, &rdev->stolen_vga_memory);
|
|
|
if (r) {
|
|
|
return r;
|
|
|
}
|
|
|
- r = radeon_bo_reserve(rdev->stollen_vga_memory, false);
|
|
|
+ r = radeon_bo_reserve(rdev->stolen_vga_memory, false);
|
|
|
if (r)
|
|
|
return r;
|
|
|
- r = radeon_bo_pin(rdev->stollen_vga_memory, RADEON_GEM_DOMAIN_VRAM, NULL);
|
|
|
- radeon_bo_unreserve(rdev->stollen_vga_memory);
|
|
|
+ r = radeon_bo_pin(rdev->stolen_vga_memory, RADEON_GEM_DOMAIN_VRAM, NULL);
|
|
|
+ radeon_bo_unreserve(rdev->stolen_vga_memory);
|
|
|
if (r) {
|
|
|
- radeon_bo_unref(&rdev->stollen_vga_memory);
|
|
|
+ radeon_bo_unref(&rdev->stolen_vga_memory);
|
|
|
return r;
|
|
|
}
|
|
|
DRM_INFO("radeon: %uM of VRAM memory ready\n",
|
|
@@ -946,13 +946,13 @@ void radeon_ttm_fini(struct radeon_device *rdev)
|
|
|
if (!rdev->mman.initialized)
|
|
|
return;
|
|
|
radeon_ttm_debugfs_fini(rdev);
|
|
|
- if (rdev->stollen_vga_memory) {
|
|
|
- r = radeon_bo_reserve(rdev->stollen_vga_memory, false);
|
|
|
+ if (rdev->stolen_vga_memory) {
|
|
|
+ r = radeon_bo_reserve(rdev->stolen_vga_memory, false);
|
|
|
if (r == 0) {
|
|
|
- radeon_bo_unpin(rdev->stollen_vga_memory);
|
|
|
- radeon_bo_unreserve(rdev->stollen_vga_memory);
|
|
|
+ radeon_bo_unpin(rdev->stolen_vga_memory);
|
|
|
+ radeon_bo_unreserve(rdev->stolen_vga_memory);
|
|
|
}
|
|
|
- radeon_bo_unref(&rdev->stollen_vga_memory);
|
|
|
+ radeon_bo_unref(&rdev->stolen_vga_memory);
|
|
|
}
|
|
|
ttm_bo_clean_mm(&rdev->mman.bdev, TTM_PL_VRAM);
|
|
|
ttm_bo_clean_mm(&rdev->mman.bdev, TTM_PL_TT);
|