Change-Id: Ib4c58b0276943f48ded4e72959fe1574001066cd
Signed-off-by: Kent Russell <kent.russ...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 6 +++---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c     | 2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c      | 4 ++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c     | 8 ++++----
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c  | 6 +++---
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.h  | 2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h   | 4 ++--
 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 540f133..9ae2be0 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,
                entry->tv.bo = &entry->robj->tbo;
                entry->tv.shared = !entry->robj->prime_shared_count;
 
-               if (entry->robj->prefered_domains == AMDGPU_GEM_DOMAIN_GDS)
+               if (entry->robj->preferred_domains == AMDGPU_GEM_DOMAIN_GDS)
                        gds_obj = entry->robj;
-               if (entry->robj->prefered_domains == AMDGPU_GEM_DOMAIN_GWS)
+               if (entry->robj->preferred_domains == AMDGPU_GEM_DOMAIN_GWS)
                        gws_obj = entry->robj;
-               if (entry->robj->prefered_domains == AMDGPU_GEM_DOMAIN_OA)
+               if (entry->robj->preferred_domains == AMDGPU_GEM_DOMAIN_OA)
                        oa_obj = entry->robj;
 
                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 343cdf9..92b925e 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
        r = amdgpu_bo_reserve(obj, true);
        if (unlikely(r != 0))
                return r;
-       r = amdgpu_bo_pin_restricted(obj, obj->prefered_domains,
+       r = amdgpu_bo_pin_restricted(obj, obj->preferred_domains,
                                     min_offset, max_offset, mcaddr);
        amdgpu_bo_unreserve(obj);
        return r;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index fe974f7..692848f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -345,11 +345,11 @@ static int amdgpu_cs_bo_validate(struct amdgpu_cs_parser 
*p,
                         * that.
                         */
                        if (p->bytes_moved_vis < p->bytes_moved_vis_threshold)
-                               domain = bo->prefered_domains;
+                               domain = bo->preferred_domains;
                        else
                                domain = bo->allowed_domains;
                } else {
-                       domain = bo->prefered_domains;
+                       domain = bo->preferred_domains;
                }
        } else {
                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 86a88a0..81127ff 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,
                return r;
 
        bo = gem_to_amdgpu_bo(gobj);
-       bo->prefered_domains = AMDGPU_GEM_DOMAIN_GTT;
+       bo->preferred_domains = AMDGPU_GEM_DOMAIN_GTT;
        bo->allowed_domains = AMDGPU_GEM_DOMAIN_GTT;
        r = amdgpu_ttm_tt_set_userptr(bo->tbo.ttm, args->addr, args->flags);
        if (r)
@@ -693,7 +693,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,
 
                info.bo_size = robj->gem_base.size;
                info.alignment = robj->tbo.mem.page_alignment << PAGE_SHIFT;
-               info.domains = robj->prefered_domains;
+               info.domains = robj->preferred_domains;
                info.domain_flags = robj->flags;
                amdgpu_bo_unreserve(robj);
                if (copy_to_user(out, &info, sizeof(info)))
@@ -711,10 +711,10 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void 
*data,
                        amdgpu_bo_unreserve(robj);
                        break;
                }
-               robj->prefered_domains = args->value & (AMDGPU_GEM_DOMAIN_VRAM |
+               robj->preferred_domains = args->value & (AMDGPU_GEM_DOMAIN_VRAM 
|
                                                        AMDGPU_GEM_DOMAIN_GTT |
                                                        AMDGPU_GEM_DOMAIN_CPU);
-               robj->allowed_domains = robj->prefered_domains;
+               robj->allowed_domains = robj->preferred_domains;
                if (robj->allowed_domains == AMDGPU_GEM_DOMAIN_VRAM)
                        robj->allowed_domains |= AMDGPU_GEM_DOMAIN_GTT;
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 16f31cb..6e72fe7 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,
        }
        INIT_LIST_HEAD(&bo->shadow_list);
        INIT_LIST_HEAD(&bo->va);
-       bo->prefered_domains = domain & (AMDGPU_GEM_DOMAIN_VRAM |
+       bo->preferred_domains = domain & (AMDGPU_GEM_DOMAIN_VRAM |
                                         AMDGPU_GEM_DOMAIN_GTT |
                                         AMDGPU_GEM_DOMAIN_CPU |
                                         AMDGPU_GEM_DOMAIN_GDS |
                                         AMDGPU_GEM_DOMAIN_GWS |
                                         AMDGPU_GEM_DOMAIN_OA);
-       bo->allowed_domains = bo->prefered_domains;
+       bo->allowed_domains = bo->preferred_domains;
        if (!kernel && bo->allowed_domains == AMDGPU_GEM_DOMAIN_VRAM)
                bo->allowed_domains |= AMDGPU_GEM_DOMAIN_GTT;
 
@@ -606,7 +606,7 @@ int amdgpu_bo_validate(struct amdgpu_bo *bo)
        if (bo->pin_count)
                return 0;
 
-       domain = bo->prefered_domains;
+       domain = bo->preferred_domains;
 
 retry:
        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 b6d8be8..9b7b4fc 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 {
 
 struct amdgpu_bo {
        /* Protected by tbo.reserved */
-       u32                             prefered_domains;
+       u32                             preferred_domains;
        u32                             allowed_domains;
        struct ttm_place                placements[AMDGPU_GEM_DOMAIN_MAX + 1];
        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 509f7a6..9ab5824 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,
                           __entry->bo = bo;
                           __entry->pages = bo->tbo.num_pages;
                           __entry->type = bo->tbo.mem.mem_type;
-                          __entry->prefer = bo->prefered_domains;
+                          __entry->prefer = bo->preferred_domains;
                           __entry->allow = bo->allowed_domains;
                           __entry->visible = bo->flags;
                           ),
 
-           TP_printk("bo=%p, pages=%u, type=%d, prefered=%d, allowed=%d, 
visible=%d",
+           TP_printk("bo=%p, pages=%u, type=%d, preferred=%d, allowed=%d, 
visible=%d",
                       __entry->bo, __entry->pages, __entry->type,
                       __entry->prefer, __entry->allow, __entry->visible)
 );
-- 
2.7.4

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

Reply via email to