aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKent Russell <kent.russell@amd.com>2017-08-08 07:48:52 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-08-15 14:46:15 -0400
commit4aa5b92fd48f88f5877d84d5e4bbb53aeb3a843c (patch)
tree66c8182159fcd4b5d639eb46f61788029996be4d
parent5af2c10dcac417b2d1ba82a9cda26bfd412a024c (diff)
drm/radeon: Fix stolen typo
Change "stollen" to "stolen" Signed-off-by: Kent Russell <kent.russell@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/radeon/radeon.h2
-rw-r--r--drivers/gpu/drm/radeon/radeon_ttm.c20
2 files changed, 11 insertions, 11 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 5008f3d4cccc..179a768687c5 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -2327,7 +2327,7 @@ struct radeon_device {
2327 uint8_t *bios; 2327 uint8_t *bios;
2328 bool is_atom_bios; 2328 bool is_atom_bios;
2329 uint16_t bios_header_start; 2329 uint16_t bios_header_start;
2330 struct radeon_bo *stollen_vga_memory; 2330 struct radeon_bo *stolen_vga_memory;
2331 /* Register mmio */ 2331 /* Register mmio */
2332 resource_size_t rmmio_base; 2332 resource_size_t rmmio_base;
2333 resource_size_t rmmio_size; 2333 resource_size_t rmmio_size;
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 2804b4a15896..50f60a587648 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)
907 907
908 r = radeon_bo_create(rdev, 256 * 1024, PAGE_SIZE, true, 908 r = radeon_bo_create(rdev, 256 * 1024, PAGE_SIZE, true,
909 RADEON_GEM_DOMAIN_VRAM, 0, NULL, 909 RADEON_GEM_DOMAIN_VRAM, 0, NULL,
910 NULL, &rdev->stollen_vga_memory); 910 NULL, &rdev->stolen_vga_memory);
911 if (r) { 911 if (r) {
912 return r; 912 return r;
913 } 913 }
914 r = radeon_bo_reserve(rdev->stollen_vga_memory, false); 914 r = radeon_bo_reserve(rdev->stolen_vga_memory, false);
915 if (r) 915 if (r)
916 return r; 916 return r;
917 r = radeon_bo_pin(rdev->stollen_vga_memory, RADEON_GEM_DOMAIN_VRAM, NULL); 917 r = radeon_bo_pin(rdev->stolen_vga_memory, RADEON_GEM_DOMAIN_VRAM, NULL);
918 radeon_bo_unreserve(rdev->stollen_vga_memory); 918 radeon_bo_unreserve(rdev->stolen_vga_memory);
919 if (r) { 919 if (r) {
920 radeon_bo_unref(&rdev->stollen_vga_memory); 920 radeon_bo_unref(&rdev->stolen_vga_memory);
921 return r; 921 return r;
922 } 922 }
923 DRM_INFO("radeon: %uM of VRAM memory ready\n", 923 DRM_INFO("radeon: %uM of VRAM memory ready\n",
@@ -946,13 +946,13 @@ void radeon_ttm_fini(struct radeon_device *rdev)
946 if (!rdev->mman.initialized) 946 if (!rdev->mman.initialized)
947 return; 947 return;
948 radeon_ttm_debugfs_fini(rdev); 948 radeon_ttm_debugfs_fini(rdev);
949 if (rdev->stollen_vga_memory) { 949 if (rdev->stolen_vga_memory) {
950 r = radeon_bo_reserve(rdev->stollen_vga_memory, false); 950 r = radeon_bo_reserve(rdev->stolen_vga_memory, false);
951 if (r == 0) { 951 if (r == 0) {
952 radeon_bo_unpin(rdev->stollen_vga_memory); 952 radeon_bo_unpin(rdev->stolen_vga_memory);
953 radeon_bo_unreserve(rdev->stollen_vga_memory); 953 radeon_bo_unreserve(rdev->stolen_vga_memory);
954 } 954 }
955 radeon_bo_unref(&rdev->stollen_vga_memory); 955 radeon_bo_unref(&rdev->stolen_vga_memory);
956 } 956 }
957 ttm_bo_clean_mm(&rdev->mman.bdev, TTM_PL_VRAM); 957 ttm_bo_clean_mm(&rdev->mman.bdev, TTM_PL_VRAM);
958 ttm_bo_clean_mm(&rdev->mman.bdev, TTM_PL_TT); 958 ttm_bo_clean_mm(&rdev->mman.bdev, TTM_PL_TT);