[PATCH 1/4] drm/amdgpu: Return EINVAL if no PT BO

[Harish Kasiviswanathan]

This change is also useful for the upcoming changes where page tables
can be updated by CPU.

Change-Id: I07510ed60c94cf1944ee96bb4b16c40ec88ea17c
Signed-off-by: Harish Kasiviswanathan <harish.kasiviswanat...@amd.com>
Reviewed-by: Christian König <christian.koe...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 48 +++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 3e97004..5d92e73 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -1165,8 +1165,9 @@ static struct amdgpu_bo *amdgpu_vm_get_pt(struct 
amdgpu_pte_update_params *p,
  * @flags: mapping flags
  *
  * Update the page tables in the range @start - @end.
+ * Returns 0 for success, -EINVAL for failure.
  */
-static void amdgpu_vm_update_ptes(struct amdgpu_pte_update_params *params,
+static int amdgpu_vm_update_ptes(struct amdgpu_pte_update_params *params,
                                  uint64_t start, uint64_t end,
                                  uint64_t dst, uint64_t flags)
 {
@@ -1184,12 +1185,12 @@ static void amdgpu_vm_update_ptes(struct 
amdgpu_pte_update_params *params,
        pt = amdgpu_vm_get_pt(params, addr);
        if (!pt) {
                pr_err("PT not found, aborting update_ptes\n");
-               return;
+               return -EINVAL;
        }
 
        if (params->shadow) {
                if (!pt->shadow)
-                       return;
+                       return 0;
                pt = pt->shadow;
        }
        if ((addr & ~mask) == (end & ~mask))
@@ -1211,12 +1212,12 @@ static void amdgpu_vm_update_ptes(struct 
amdgpu_pte_update_params *params,
                pt = amdgpu_vm_get_pt(params, addr);
                if (!pt) {
                        pr_err("PT not found, aborting update_ptes\n");
-                       return;
+                       return -EINVAL;
                }
 
                if (params->shadow) {
                        if (!pt->shadow)
-                               return;
+                               return 0;
                        pt = pt->shadow;
                }
 
@@ -1251,6 +1252,8 @@ static void amdgpu_vm_update_ptes(struct 
amdgpu_pte_update_params *params,
 
        params->func(params, cur_pe_start, cur_dst, cur_nptes,
                     AMDGPU_GPU_PAGE_SIZE, flags);
+
+       return 0;
 }
 
 /*
@@ -1262,11 +1265,14 @@ static void amdgpu_vm_update_ptes(struct 
amdgpu_pte_update_params *params,
  * @end: last PTE to handle
  * @dst: addr those PTEs should point to
  * @flags: hw mapping flags
+ * Returns 0 for success, -EINVAL for failure.
  */
-static void amdgpu_vm_frag_ptes(struct amdgpu_pte_update_params        *params,
+static int amdgpu_vm_frag_ptes(struct amdgpu_pte_update_params *params,
                                uint64_t start, uint64_t end,
                                uint64_t dst, uint64_t flags)
 {
+       int r;
+
        /**
         * The MC L1 TLB supports variable sized pages, based on a fragment
         * field in the PTE. When this field is set to a non-zero value, page
@@ -1295,28 +1301,30 @@ static void amdgpu_vm_frag_ptes(struct 
amdgpu_pte_update_params *params,
 
        /* system pages are non continuously */
        if (params->src || !(flags & AMDGPU_PTE_VALID) ||
-           (frag_start >= frag_end)) {
-
-               amdgpu_vm_update_ptes(params, start, end, dst, flags);
-               return;
-       }
+           (frag_start >= frag_end))
+               return amdgpu_vm_update_ptes(params, start, end, dst, flags);
 
        /* handle the 4K area at the beginning */
        if (start != frag_start) {
-               amdgpu_vm_update_ptes(params, start, frag_start,
-                                     dst, flags);
+               r = amdgpu_vm_update_ptes(params, start, frag_start,
+                                         dst, flags);
+               if (r)
+                       return r;
                dst += (frag_start - start) * AMDGPU_GPU_PAGE_SIZE;
        }
 
        /* handle the area in the middle */
-       amdgpu_vm_update_ptes(params, frag_start, frag_end, dst,
-                             flags | frag_flags);
+       r = amdgpu_vm_update_ptes(params, frag_start, frag_end, dst,
+                                 flags | frag_flags);
+       if (r)
+               return r;
 
        /* handle the 4K area at the end */
        if (frag_end != end) {
                dst += (frag_end - frag_start) * AMDGPU_GPU_PAGE_SIZE;
-               amdgpu_vm_update_ptes(params, frag_end, end, dst, flags);
+               r = amdgpu_vm_update_ptes(params, frag_end, end, dst, flags);
        }
+       return r;
 }
 
 /**
@@ -1437,9 +1445,13 @@ static int amdgpu_vm_bo_update_mapping(struct 
amdgpu_device *adev,
                goto error_free;
 
        params.shadow = true;
-       amdgpu_vm_frag_ptes(&params, start, last + 1, addr, flags);
+       r = amdgpu_vm_frag_ptes(&params, start, last + 1, addr, flags);
+       if (r)
+               goto error_free;
        params.shadow = false;
-       amdgpu_vm_frag_ptes(&params, start, last + 1, addr, flags);
+       r = amdgpu_vm_frag_ptes(&params, start, last + 1, addr, flags);
+       if (r)
+               goto error_free;
 
        amdgpu_ring_pad_ib(ring, params.ib);
        WARN_ON(params.ib->length_dw > ndw);
-- 
1.9.1

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