Merge branch 'next' into for-linus

Prepare input updates for 4.12 merge window.

1 files changed, 49 insertions, 44 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index cd62f6ffde2a..106cf83c2e6b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -202,6 +202,27 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data,
         bool kernel = false;
         int r;
 
+        /* reject invalid gem flags */
+        if (args->in.domain_flags & ~(AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |
+                                      AMDGPU_GEM_CREATE_NO_CPU_ACCESS |
+                                      AMDGPU_GEM_CREATE_CPU_GTT_USWC |
+                                      AMDGPU_GEM_CREATE_VRAM_CLEARED|
+                                      AMDGPU_GEM_CREATE_SHADOW |
+                                      AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS)) {
+                r = -EINVAL;
+                goto error_unlock;
+        }
+        /* reject invalid gem domains */
+        if (args->in.domains & ~(AMDGPU_GEM_DOMAIN_CPU |
+                                 AMDGPU_GEM_DOMAIN_GTT |
+                                 AMDGPU_GEM_DOMAIN_VRAM |
+                                 AMDGPU_GEM_DOMAIN_GDS |
+                                 AMDGPU_GEM_DOMAIN_GWS |
+                                 AMDGPU_GEM_DOMAIN_OA)) {
+                r = -EINVAL;
+                goto error_unlock;
+        }
+
         /* create a gem object to contain this object in */
         if (args->in.domains & (AMDGPU_GEM_DOMAIN_GDS |
             AMDGPU_GEM_DOMAIN_GWS | AMDGPU_GEM_DOMAIN_OA)) {
@@ -471,12 +492,15 @@ out:
 
 static int amdgpu_gem_va_check(void *param, struct amdgpu_bo *bo)
 {
-        unsigned domain = amdgpu_mem_type_to_domain(bo->tbo.mem.mem_type);
-
         /* if anything is swapped out don't swap it in here,
            just abort and wait for the next CS */
+        if (!amdgpu_bo_gpu_accessible(bo))
+                return -ERESTARTSYS;
+
+        if (bo->shadow && !amdgpu_bo_gpu_accessible(bo->shadow))
+                return -ERESTARTSYS;
 
-        return domain == AMDGPU_GEM_DOMAIN_CPU ? -ERESTARTSYS : 0;
+        return 0;
 }
 
 /**
@@ -484,62 +508,44 @@ static int amdgpu_gem_va_check(void *param, struct amdgpu_bo *bo)
  *
  * @adev: amdgpu_device pointer
  * @bo_va: bo_va to update
+ * @list: validation list
+ * @operation: map or unmap
  *
- * Update the bo_va directly after setting it's address. Errors are not
+ * Update the bo_va directly after setting its address. Errors are not
  * vital here, so they are not reported back to userspace.
  */
 static void amdgpu_gem_va_update_vm(struct amdgpu_device *adev,
                                     struct amdgpu_bo_va *bo_va,
+                                    struct list_head *list,
                                     uint32_t operation)
 {
-        struct ttm_validate_buffer tv, *entry;
-        struct amdgpu_bo_list_entry vm_pd;
-        struct ww_acquire_ctx ticket;
-        struct list_head list, duplicates;
-        unsigned domain;
-        int r;
-
-        INIT_LIST_HEAD(&list);
-        INIT_LIST_HEAD(&duplicates);
-
-        tv.bo = &bo_va->bo->tbo;
-        tv.shared = true;
-        list_add(&tv.head, &list);
-
-        amdgpu_vm_get_pd_bo(bo_va->vm, &list, &vm_pd);
-
-        /* Provide duplicates to avoid -EALREADY */
-        r = ttm_eu_reserve_buffers(&ticket, &list, true, &duplicates);
-        if (r)
-                goto error_print;
-
-        list_for_each_entry(entry, &list, head) {
-                domain = amdgpu_mem_type_to_domain(entry->bo->mem.mem_type);
-                /* if anything is swapped out don't swap it in here,
-                   just abort and wait for the next CS */
-                if (domain == AMDGPU_GEM_DOMAIN_CPU)
-                        goto error_unreserve;
+        struct ttm_validate_buffer *entry;
+        int r = -ERESTARTSYS;
+
+        list_for_each_entry(entry, list, head) {
+                struct amdgpu_bo *bo =
+                        container_of(entry->bo, struct amdgpu_bo, tbo);
+                if (amdgpu_gem_va_check(NULL, bo))
+                        goto error;
         }
+
         r = amdgpu_vm_validate_pt_bos(adev, bo_va->vm, amdgpu_gem_va_check,
                                       NULL);
         if (r)
-                goto error_unreserve;
+                goto error;
 
         r = amdgpu_vm_update_page_directory(adev, bo_va->vm);
         if (r)
-                goto error_unreserve;
+                goto error;
 
         r = amdgpu_vm_clear_freed(adev, bo_va->vm);
         if (r)
-                goto error_unreserve;
+                goto error;
 
         if (operation == AMDGPU_VA_OP_MAP)
                 r = amdgpu_vm_bo_update(adev, bo_va, false);
 
-error_unreserve:
-        ttm_eu_backoff_reservation(&ticket, &list);
-
-error_print:
+error:
         if (r && r != -ERESTARTSYS)
                 DRM_ERROR("Couldn't update BO_VA (%d)\n", r);
 }
@@ -556,7 +562,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
         struct amdgpu_bo_list_entry vm_pd;
         struct ttm_validate_buffer tv;
         struct ww_acquire_ctx ticket;
-        struct list_head list, duplicates;
+        struct list_head list;
         uint32_t invalid_flags, va_flags = 0;
         int r = 0;
 
@@ -594,14 +600,13 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
                 return -ENOENT;
         abo = gem_to_amdgpu_bo(gobj);
         INIT_LIST_HEAD(&list);
-        INIT_LIST_HEAD(&duplicates);
         tv.bo = &abo->tbo;
-        tv.shared = true;
+        tv.shared = false;
         list_add(&tv.head, &list);
 
         amdgpu_vm_get_pd_bo(&fpriv->vm, &list, &vm_pd);
 
-        r = ttm_eu_reserve_buffers(&ticket, &list, true, &duplicates);
+        r = ttm_eu_reserve_buffers(&ticket, &list, true, NULL);
         if (r) {
                 drm_gem_object_unreference_unlocked(gobj);
                 return r;
@@ -632,10 +637,10 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
         default:
                 break;
         }
-        ttm_eu_backoff_reservation(&ticket, &list);
         if (!r && !(args->flags & AMDGPU_VM_DELAY_UPDATE) &&
             !amdgpu_vm_debug)
-                amdgpu_gem_va_update_vm(adev, bo_va, args->operation);
+                amdgpu_gem_va_update_vm(adev, bo_va, &list, args->operation);
+        ttm_eu_backoff_reservation(&ticket, &list);
 
         drm_gem_object_unreference_unlocked(gobj);
         return r;