diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_ttm.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_ttm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 58b5adf974ca..43c5ab34b634 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c | |||
@@ -150,7 +150,7 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, | |||
150 | man->default_caching = TTM_PL_FLAG_CACHED; | 150 | man->default_caching = TTM_PL_FLAG_CACHED; |
151 | break; | 151 | break; |
152 | case TTM_PL_TT: | 152 | case TTM_PL_TT: |
153 | man->gpu_offset = rdev->mc.gtt_location; | 153 | man->gpu_offset = rdev->mc.gtt_start; |
154 | man->available_caching = TTM_PL_MASK_CACHING; | 154 | man->available_caching = TTM_PL_MASK_CACHING; |
155 | man->default_caching = TTM_PL_FLAG_CACHED; | 155 | man->default_caching = TTM_PL_FLAG_CACHED; |
156 | man->flags = TTM_MEMTYPE_FLAG_MAPPABLE | TTM_MEMTYPE_FLAG_CMA; | 156 | man->flags = TTM_MEMTYPE_FLAG_MAPPABLE | TTM_MEMTYPE_FLAG_CMA; |
@@ -180,7 +180,7 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, | |||
180 | break; | 180 | break; |
181 | case TTM_PL_VRAM: | 181 | case TTM_PL_VRAM: |
182 | /* "On-card" video ram */ | 182 | /* "On-card" video ram */ |
183 | man->gpu_offset = rdev->mc.vram_location; | 183 | man->gpu_offset = rdev->mc.vram_start; |
184 | man->flags = TTM_MEMTYPE_FLAG_FIXED | | 184 | man->flags = TTM_MEMTYPE_FLAG_FIXED | |
185 | TTM_MEMTYPE_FLAG_NEEDS_IOREMAP | | 185 | TTM_MEMTYPE_FLAG_NEEDS_IOREMAP | |
186 | TTM_MEMTYPE_FLAG_MAPPABLE; | 186 | TTM_MEMTYPE_FLAG_MAPPABLE; |
@@ -262,10 +262,10 @@ static int radeon_move_blit(struct ttm_buffer_object *bo, | |||
262 | 262 | ||
263 | switch (old_mem->mem_type) { | 263 | switch (old_mem->mem_type) { |
264 | case TTM_PL_VRAM: | 264 | case TTM_PL_VRAM: |
265 | old_start += rdev->mc.vram_location; | 265 | old_start += rdev->mc.vram_start; |
266 | break; | 266 | break; |
267 | case TTM_PL_TT: | 267 | case TTM_PL_TT: |
268 | old_start += rdev->mc.gtt_location; | 268 | old_start += rdev->mc.gtt_start; |
269 | break; | 269 | break; |
270 | default: | 270 | default: |
271 | DRM_ERROR("Unknown placement %d\n", old_mem->mem_type); | 271 | DRM_ERROR("Unknown placement %d\n", old_mem->mem_type); |
@@ -273,10 +273,10 @@ static int radeon_move_blit(struct ttm_buffer_object *bo, | |||
273 | } | 273 | } |
274 | switch (new_mem->mem_type) { | 274 | switch (new_mem->mem_type) { |
275 | case TTM_PL_VRAM: | 275 | case TTM_PL_VRAM: |
276 | new_start += rdev->mc.vram_location; | 276 | new_start += rdev->mc.vram_start; |
277 | break; | 277 | break; |
278 | case TTM_PL_TT: | 278 | case TTM_PL_TT: |
279 | new_start += rdev->mc.gtt_location; | 279 | new_start += rdev->mc.gtt_start; |
280 | break; | 280 | break; |
281 | default: | 281 | default: |
282 | DRM_ERROR("Unknown placement %d\n", old_mem->mem_type); | 282 | DRM_ERROR("Unknown placement %d\n", old_mem->mem_type); |