aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKent Russell <kent.russell@amd.com>2017-08-08 07:58:01 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-08-15 14:46:16 -0400
commit6d7d9c5aa212d069b5271cd6bb8a9e05a3e1b986 (patch)
treea9faeee8e7dc447dc8f51fb72e75cdc26dc8c99b
parent4aa5b92fd48f88f5877d84d5e4bbb53aeb3a843c (diff)
drm/amdgpu: Fix preferred typo
Change "prefered" to "preferred" 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/amd/amdgpu/amdgpu_bo_list.c6
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c2
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c4
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c8
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_object.c6
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_object.h2
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h4
7 files changed, 16 insertions, 16 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c
index 75c6107eaccf..59089e027f4d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c
@@ -156,11 +156,11 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev,
156 entry->tv.bo = &entry->robj->tbo; 156 entry->tv.bo = &entry->robj->tbo;
157 entry->tv.shared = !entry->robj->prime_shared_count; 157 entry->tv.shared = !entry->robj->prime_shared_count;
158 158
159 if (entry->robj->prefered_domains == AMDGPU_GEM_DOMAIN_GDS) 159 if (entry->robj->preferred_domains == AMDGPU_GEM_DOMAIN_GDS)
160 gds_obj = entry->robj; 160 gds_obj = entry->robj;
161 if (entry->robj->prefered_domains == AMDGPU_GEM_DOMAIN_GWS) 161 if (entry->robj->preferred_domains == AMDGPU_GEM_DOMAIN_GWS)
162 gws_obj = entry->robj; 162 gws_obj = entry->robj;
163 if (entry->robj->prefered_domains == AMDGPU_GEM_DOMAIN_OA) 163 if (entry->robj->preferred_domains == AMDGPU_GEM_DOMAIN_OA)
164 oa_obj = entry->robj; 164 oa_obj = entry->robj;
165 165
166 total_size += amdgpu_bo_size(entry->robj); 166 total_size += amdgpu_bo_size(entry->robj);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
index 69806c5bcd01..8c462b091aff 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -166,7 +166,7 @@ static int amdgpu_cgs_gmap_gpu_mem(struct cgs_device *cgs_device, cgs_handle_t h
166 r = amdgpu_bo_reserve(obj, true); 166 r = amdgpu_bo_reserve(obj, true);
167 if (unlikely(r != 0)) 167 if (unlikely(r != 0))
168 return r; 168 return r;
169 r = amdgpu_bo_pin_restricted(obj, obj->prefered_domains, 169 r = amdgpu_bo_pin_restricted(obj, obj->preferred_domains,
170 min_offset, max_offset, mcaddr); 170 min_offset, max_offset, mcaddr);
171 amdgpu_bo_unreserve(obj); 171 amdgpu_bo_unreserve(obj);
172 return r; 172 return r;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index da8209945ef2..c05479ec825a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -348,11 +348,11 @@ static int amdgpu_cs_bo_validate(struct amdgpu_cs_parser *p,
348 * that. 348 * that.
349 */ 349 */
350 if (p->bytes_moved_vis < p->bytes_moved_vis_threshold) 350 if (p->bytes_moved_vis < p->bytes_moved_vis_threshold)
351 domain = bo->prefered_domains; 351 domain = bo->preferred_domains;
352 else 352 else
353 domain = bo->allowed_domains; 353 domain = bo->allowed_domains;
354 } else { 354 } else {
355 domain = bo->prefered_domains; 355 domain = bo->preferred_domains;
356 } 356 }
357 } else { 357 } else {
358 domain = bo->allowed_domains; 358 domain = bo->allowed_domains;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index 86a88a025b17..81127ffcefb2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -306,7 +306,7 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data,
306 return r; 306 return r;
307 307
308 bo = gem_to_amdgpu_bo(gobj); 308 bo = gem_to_amdgpu_bo(gobj);
309 bo->prefered_domains = AMDGPU_GEM_DOMAIN_GTT; 309 bo->preferred_domains = AMDGPU_GEM_DOMAIN_GTT;
310 bo->allowed_domains = AMDGPU_GEM_DOMAIN_GTT; 310 bo->allowed_domains = AMDGPU_GEM_DOMAIN_GTT;
311 r = amdgpu_ttm_tt_set_userptr(bo->tbo.ttm, args->addr, args->flags); 311 r = amdgpu_ttm_tt_set_userptr(bo->tbo.ttm, args->addr, args->flags);
312 if (r) 312 if (r)
@@ -693,7 +693,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,
693 693
694 info.bo_size = robj->gem_base.size; 694 info.bo_size = robj->gem_base.size;
695 info.alignment = robj->tbo.mem.page_alignment << PAGE_SHIFT; 695 info.alignment = robj->tbo.mem.page_alignment << PAGE_SHIFT;
696 info.domains = robj->prefered_domains; 696 info.domains = robj->preferred_domains;
697 info.domain_flags = robj->flags; 697 info.domain_flags = robj->flags;
698 amdgpu_bo_unreserve(robj); 698 amdgpu_bo_unreserve(robj);
699 if (copy_to_user(out, &info, sizeof(info))) 699 if (copy_to_user(out, &info, sizeof(info)))
@@ -711,10 +711,10 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,
711 amdgpu_bo_unreserve(robj); 711 amdgpu_bo_unreserve(robj);
712 break; 712 break;
713 } 713 }
714 robj->prefered_domains = args->value & (AMDGPU_GEM_DOMAIN_VRAM | 714 robj->preferred_domains = args->value & (AMDGPU_GEM_DOMAIN_VRAM |
715 AMDGPU_GEM_DOMAIN_GTT | 715 AMDGPU_GEM_DOMAIN_GTT |
716 AMDGPU_GEM_DOMAIN_CPU); 716 AMDGPU_GEM_DOMAIN_CPU);
717 robj->allowed_domains = robj->prefered_domains; 717 robj->allowed_domains = robj->preferred_domains;
718 if (robj->allowed_domains == AMDGPU_GEM_DOMAIN_VRAM) 718 if (robj->allowed_domains == AMDGPU_GEM_DOMAIN_VRAM)
719 robj->allowed_domains |= AMDGPU_GEM_DOMAIN_GTT; 719 robj->allowed_domains |= AMDGPU_GEM_DOMAIN_GTT;
720 720
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 16f31cbd9147..6e72fe7901ec 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -391,13 +391,13 @@ int amdgpu_bo_create_restricted(struct amdgpu_device *adev,
391 } 391 }
392 INIT_LIST_HEAD(&bo->shadow_list); 392 INIT_LIST_HEAD(&bo->shadow_list);
393 INIT_LIST_HEAD(&bo->va); 393 INIT_LIST_HEAD(&bo->va);
394 bo->prefered_domains = domain & (AMDGPU_GEM_DOMAIN_VRAM | 394 bo->preferred_domains = domain & (AMDGPU_GEM_DOMAIN_VRAM |
395 AMDGPU_GEM_DOMAIN_GTT | 395 AMDGPU_GEM_DOMAIN_GTT |
396 AMDGPU_GEM_DOMAIN_CPU | 396 AMDGPU_GEM_DOMAIN_CPU |
397 AMDGPU_GEM_DOMAIN_GDS | 397 AMDGPU_GEM_DOMAIN_GDS |
398 AMDGPU_GEM_DOMAIN_GWS | 398 AMDGPU_GEM_DOMAIN_GWS |
399 AMDGPU_GEM_DOMAIN_OA); 399 AMDGPU_GEM_DOMAIN_OA);
400 bo->allowed_domains = bo->prefered_domains; 400 bo->allowed_domains = bo->preferred_domains;
401 if (!kernel && bo->allowed_domains == AMDGPU_GEM_DOMAIN_VRAM) 401 if (!kernel && bo->allowed_domains == AMDGPU_GEM_DOMAIN_VRAM)
402 bo->allowed_domains |= AMDGPU_GEM_DOMAIN_GTT; 402 bo->allowed_domains |= AMDGPU_GEM_DOMAIN_GTT;
403 403
@@ -606,7 +606,7 @@ int amdgpu_bo_validate(struct amdgpu_bo *bo)
606 if (bo->pin_count) 606 if (bo->pin_count)
607 return 0; 607 return 0;
608 608
609 domain = bo->prefered_domains; 609 domain = bo->preferred_domains;
610 610
611retry: 611retry:
612 amdgpu_ttm_placement_from_domain(bo, domain); 612 amdgpu_ttm_placement_from_domain(bo, domain);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
index b6d8be84b884..9b7b4fcb047b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
@@ -65,7 +65,7 @@ struct amdgpu_bo_va {
65 65
66struct amdgpu_bo { 66struct amdgpu_bo {
67 /* Protected by tbo.reserved */ 67 /* Protected by tbo.reserved */
68 u32 prefered_domains; 68 u32 preferred_domains;
69 u32 allowed_domains; 69 u32 allowed_domains;
70 struct ttm_place placements[AMDGPU_GEM_DOMAIN_MAX + 1]; 70 struct ttm_place placements[AMDGPU_GEM_DOMAIN_MAX + 1];
71 struct ttm_placement placement; 71 struct ttm_placement placement;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
index 509f7a63d40c..9ab58245e518 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
@@ -105,12 +105,12 @@ TRACE_EVENT(amdgpu_bo_create,
105 __entry->bo = bo; 105 __entry->bo = bo;
106 __entry->pages = bo->tbo.num_pages; 106 __entry->pages = bo->tbo.num_pages;
107 __entry->type = bo->tbo.mem.mem_type; 107 __entry->type = bo->tbo.mem.mem_type;
108 __entry->prefer = bo->prefered_domains; 108 __entry->prefer = bo->preferred_domains;
109 __entry->allow = bo->allowed_domains; 109 __entry->allow = bo->allowed_domains;
110 __entry->visible = bo->flags; 110 __entry->visible = bo->flags;
111 ), 111 ),
112 112
113 TP_printk("bo=%p, pages=%u, type=%d, prefered=%d, allowed=%d, visible=%d", 113 TP_printk("bo=%p, pages=%u, type=%d, preferred=%d, allowed=%d, visible=%d",
114 __entry->bo, __entry->pages, __entry->type, 114 __entry->bo, __entry->pages, __entry->type,
115 __entry->prefer, __entry->allow, __entry->visible) 115 __entry->prefer, __entry->allow, __entry->visible)
116); 116);