1 files changed, 17 insertions, 17 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index 917ac5e074a0..81127ffcefb2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -59,7 +59,7 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size,
 
 retry:
         r = amdgpu_bo_create(adev, size, alignment, kernel, initial_domain,
-                             flags, NULL, NULL, &robj);
+                             flags, NULL, NULL, 0, &robj);
         if (r) {
                 if (r != -ERESTARTSYS) {
                         if (initial_domain == AMDGPU_GEM_DOMAIN_VRAM) {
@@ -91,7 +91,7 @@ void amdgpu_gem_force_release(struct amdgpu_device *adev)
                 spin_lock(&file->table_lock);
                 idr_for_each_entry(&file->object_idr, gobj, handle) {
                         WARN_ONCE(1, "And also active allocations!\n");
-                        drm_gem_object_unreference_unlocked(gobj);
+                        drm_gem_object_put_unlocked(gobj);
                 }
                 idr_destroy(&file->object_idr);
                 spin_unlock(&file->table_lock);
@@ -263,7 +263,7 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data,
 
         r = drm_gem_handle_create(filp, gobj, &handle);
         /* drop reference from allocate - handle holds it now */
-        drm_gem_object_unreference_unlocked(gobj);
+        drm_gem_object_put_unlocked(gobj);
         if (r)
                 return r;
 
@@ -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)
@@ -341,7 +341,7 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data,
 
         r = drm_gem_handle_create(filp, gobj, &handle);
         /* drop reference from allocate - handle holds it now */
-        drm_gem_object_unreference_unlocked(gobj);
+        drm_gem_object_put_unlocked(gobj);
         if (r)
                 return r;
 
@@ -355,7 +355,7 @@ unlock_mmap_sem:
         up_read(&current->mm->mmap_sem);
 
 release_object:
-        drm_gem_object_unreference_unlocked(gobj);
+        drm_gem_object_put_unlocked(gobj);
 
         return r;
 }
@@ -374,11 +374,11 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp,
         robj = gem_to_amdgpu_bo(gobj);
         if (amdgpu_ttm_tt_get_usermm(robj->tbo.ttm) ||
             (robj->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS)) {
-                drm_gem_object_unreference_unlocked(gobj);
+                drm_gem_object_put_unlocked(gobj);
                 return -EPERM;
         }
         *offset_p = amdgpu_bo_mmap_offset(robj);
-        drm_gem_object_unreference_unlocked(gobj);
+        drm_gem_object_put_unlocked(gobj);
         return 0;
 }
 
@@ -448,7 +448,7 @@ int amdgpu_gem_wait_idle_ioctl(struct drm_device *dev, void *data,
         } else
                 r = ret;
 
-        drm_gem_object_unreference_unlocked(gobj);
+        drm_gem_object_put_unlocked(gobj);
         return r;
 }
 
@@ -491,7 +491,7 @@ int amdgpu_gem_metadata_ioctl(struct drm_device *dev, void *data,
 unreserve:
         amdgpu_bo_unreserve(robj);
 out:
-        drm_gem_object_unreference_unlocked(gobj);
+        drm_gem_object_put_unlocked(gobj);
         return r;
 }
 
@@ -664,7 +664,7 @@ error_backoff:
         ttm_eu_backoff_reservation(&ticket, &list);
 
 error_unref:
-        drm_gem_object_unreference_unlocked(gobj);
+        drm_gem_object_put_unlocked(gobj);
         return r;
 }
 
@@ -689,11 +689,11 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,
         switch (args->op) {
         case AMDGPU_GEM_OP_GET_GEM_CREATE_INFO: {
                 struct drm_amdgpu_gem_create_in info;
-                void __user *out = (void __user *)(uintptr_t)args->value;
+                void __user *out = u64_to_user_ptr(args->value);
 
                 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;
 
@@ -726,7 +726,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,
         }
 
 out:
-        drm_gem_object_unreference_unlocked(gobj);
+        drm_gem_object_put_unlocked(gobj);
         return r;
 }
 
@@ -754,7 +754,7 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv,
 
         r = drm_gem_handle_create(file_priv, gobj, &handle);
         /* drop reference from allocate - handle holds it now */
-        drm_gem_object_unreference_unlocked(gobj);
+        drm_gem_object_put_unlocked(gobj);
         if (r) {
                 return r;
         }