|
@@ -306,7 +306,7 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data,
|
|
return r;
|
|
return r;
|
|
|
|
|
|
bo = gem_to_amdgpu_bo(gobj);
|
|
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;
|
|
bo->allowed_domains = AMDGPU_GEM_DOMAIN_GTT;
|
|
r = amdgpu_ttm_tt_set_userptr(bo->tbo.ttm, args->addr, args->flags);
|
|
r = amdgpu_ttm_tt_set_userptr(bo->tbo.ttm, args->addr, args->flags);
|
|
if (r)
|
|
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.bo_size = robj->gem_base.size;
|
|
info.alignment = robj->tbo.mem.page_alignment << PAGE_SHIFT;
|
|
info.alignment = robj->tbo.mem.page_alignment << PAGE_SHIFT;
|
|
- info.domains = robj->prefered_domains;
|
|
|
|
|
|
+ info.domains = robj->preferred_domains;
|
|
info.domain_flags = robj->flags;
|
|
info.domain_flags = robj->flags;
|
|
amdgpu_bo_unreserve(robj);
|
|
amdgpu_bo_unreserve(robj);
|
|
if (copy_to_user(out, &info, sizeof(info)))
|
|
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);
|
|
amdgpu_bo_unreserve(robj);
|
|
break;
|
|
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_GTT |
|
|
AMDGPU_GEM_DOMAIN_CPU);
|
|
AMDGPU_GEM_DOMAIN_CPU);
|
|
- robj->allowed_domains = robj->prefered_domains;
|
|
|
|
|
|
+ robj->allowed_domains = robj->preferred_domains;
|
|
if (robj->allowed_domains == AMDGPU_GEM_DOMAIN_VRAM)
|
|
if (robj->allowed_domains == AMDGPU_GEM_DOMAIN_VRAM)
|
|
robj->allowed_domains |= AMDGPU_GEM_DOMAIN_GTT;
|
|
robj->allowed_domains |= AMDGPU_GEM_DOMAIN_GTT;
|
|
|
|
|