Change-Id: I3353c8fadc633a7103d946846d54cc7bd49f299c
Signed-off-by: Kent Russell <kent.russ...@amd.com>
---
 drivers/gpu/drm/radeon/radeon.h        | 2 +-
 drivers/gpu/drm/radeon/radeon_cs.c     | 8 ++++----
 drivers/gpu/drm/radeon/radeon_object.c | 2 +-
 drivers/gpu/drm/radeon/radeon_vm.c     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 2f23488..5048242 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -464,7 +464,7 @@ struct radeon_bo_list {
        struct radeon_bo                *robj;
        struct ttm_validate_buffer      tv;
        uint64_t                        gpu_offset;
-       unsigned                        prefered_domains;
+       unsigned                        preferred_domains;
        unsigned                        allowed_domains;
        uint32_t                        tiling_flags;
 };
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c 
b/drivers/gpu/drm/radeon/radeon_cs.c
index ae1b10c..8ba88d3 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -129,7 +129,7 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser 
*p)
                     p->rdev->family == CHIP_RS880)) {
 
                        /* TODO: is this still needed for NI+ ? */
-                       p->relocs[i].prefered_domains =
+                       p->relocs[i].preferred_domains =
                                RADEON_GEM_DOMAIN_VRAM;
 
                        p->relocs[i].allowed_domains =
@@ -147,14 +147,14 @@ static int radeon_cs_parser_relocs(struct 
radeon_cs_parser *p)
                                return -EINVAL;
                        }
 
-                       p->relocs[i].prefered_domains = domain;
+                       p->relocs[i].preferred_domains = domain;
                        if (domain == RADEON_GEM_DOMAIN_VRAM)
                                domain |= RADEON_GEM_DOMAIN_GTT;
                        p->relocs[i].allowed_domains = domain;
                }
 
                if (radeon_ttm_tt_has_userptr(p->relocs[i].robj->tbo.ttm)) {
-                       uint32_t domain = p->relocs[i].prefered_domains;
+                       uint32_t domain = p->relocs[i].preferred_domains;
                        if (!(domain & RADEON_GEM_DOMAIN_GTT)) {
                                DRM_ERROR("Only RADEON_GEM_DOMAIN_GTT is "
                                          "allowed for userptr BOs\n");
@@ -162,7 +162,7 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser 
*p)
                        }
                        need_mmap_lock = true;
                        domain = RADEON_GEM_DOMAIN_GTT;
-                       p->relocs[i].prefered_domains = domain;
+                       p->relocs[i].preferred_domains = domain;
                        p->relocs[i].allowed_domains = domain;
                }
 
diff --git a/drivers/gpu/drm/radeon/radeon_object.c 
b/drivers/gpu/drm/radeon/radeon_object.c
index ad2a2fd..0935949 100644
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -546,7 +546,7 @@ int radeon_bo_list_validate(struct radeon_device *rdev,
        list_for_each_entry(lobj, head, tv.head) {
                struct radeon_bo *bo = lobj->robj;
                if (!bo->pin_count) {
-                       u32 domain = lobj->prefered_domains;
+                       u32 domain = lobj->preferred_domains;
                        u32 allowed = lobj->allowed_domains;
                        u32 current_domain =
                                radeon_mem_type_to_domain(bo->tbo.mem.mem_type);
diff --git a/drivers/gpu/drm/radeon/radeon_vm.c 
b/drivers/gpu/drm/radeon/radeon_vm.c
index a135874..af83ee5 100644
--- a/drivers/gpu/drm/radeon/radeon_vm.c
+++ b/drivers/gpu/drm/radeon/radeon_vm.c
@@ -139,7 +139,7 @@ struct radeon_bo_list *radeon_vm_get_bos(struct 
radeon_device *rdev,
 
        /* add the vm page table to the list */
        list[0].robj = vm->page_directory;
-       list[0].prefered_domains = RADEON_GEM_DOMAIN_VRAM;
+       list[0].preferred_domains = RADEON_GEM_DOMAIN_VRAM;
        list[0].allowed_domains = RADEON_GEM_DOMAIN_VRAM;
        list[0].tv.bo = &vm->page_directory->tbo;
        list[0].tv.shared = true;
@@ -151,7 +151,7 @@ struct radeon_bo_list *radeon_vm_get_bos(struct 
radeon_device *rdev,
                        continue;
 
                list[idx].robj = vm->page_tables[i].bo;
-               list[idx].prefered_domains = RADEON_GEM_DOMAIN_VRAM;
+               list[idx].preferred_domains = RADEON_GEM_DOMAIN_VRAM;
                list[idx].allowed_domains = RADEON_GEM_DOMAIN_VRAM;
                list[idx].tv.bo = &list[idx].robj->tbo;
                list[idx].tv.shared = true;
-- 
2.7.4

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

Reply via email to