Change-Id: I44836001fa7469e52928d08ac3219f34ca945c42
Signed-off-by: Kent Russell <kent.russ...@amd.com>
---
 drivers/gpu/drm/radeon/radeon.h     |  2 +-
 drivers/gpu/drm/radeon/radeon_ttm.c | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 89ea0d9..2f23488 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -2327,7 +2327,7 @@ struct radeon_device {
        uint8_t                         *bios;
        bool                            is_atom_bios;
        uint16_t                        bios_header_start;
-       struct radeon_bo                *stollen_vga_memory;
+       struct radeon_bo                *stolen_vga_memory;
        /* Register mmio */
        resource_size_t                 rmmio_base;
        resource_size_t                 rmmio_size;
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c 
b/drivers/gpu/drm/radeon/radeon_ttm.c
index 6499832..72d98a3 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -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);
-- 
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reply via email to