diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 8 |
1 files changed, 4 insertions, 4 deletions
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 | ||