Merge drm/drm-next into drm-misc-next

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_cs.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index b5c7669980458480f2ff167fd55521eb18a56852..1476236f5c7c14c1a6f2a6a7a89d71a3e694d8d3 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -396,10 +396,10 @@ void amdgpu_cs_report_moved_bytes(struct amdgpu_device *adev, u64 num_bytes,
        spin_unlock(&adev->mm_stats.lock);
 }
 
        spin_unlock(&adev->mm_stats.lock);
 }
 

-static int amdgpu_cs_bo_validate(struct amdgpu_cs_parser *p,
-                                struct amdgpu_bo *bo)
+static int amdgpu_cs_bo_validate(void *param, struct amdgpu_bo *bo)

 {
        struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
 {
        struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);

+       struct amdgpu_cs_parser *p = param;

        struct ttm_operation_ctx ctx = {
                .interruptible = true,
                .no_wait_gpu = false,
        struct ttm_operation_ctx ctx = {
                .interruptible = true,
                .no_wait_gpu = false,


@@ -451,21 +451,6 @@ retry:
        return r;
 }
 
        return r;
 }
 

-static int amdgpu_cs_validate(void *param, struct amdgpu_bo *bo)
-{
-       struct amdgpu_cs_parser *p = param;
-       int r;
-
-       r = amdgpu_cs_bo_validate(p, bo);
-       if (r)
-               return r;
-
-       if (bo->shadow)
-               r = amdgpu_cs_bo_validate(p, bo->shadow);
-
-       return r;
-}
-

 static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p,
                            struct list_head *validated)
 {
 static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p,
                            struct list_head *validated)
 {


@@ -493,7 +478,7 @@ static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p,
                                                     lobj->user_pages);
                }
 
                                                     lobj->user_pages);
                }
 

-               r = amdgpu_cs_validate(p, bo);
+               r = amdgpu_cs_bo_validate(p, bo);

                if (r)
                        return r;
 
                if (r)
                        return r;
 


@@ -593,7 +578,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,
        p->bytes_moved_vis = 0;
 
        r = amdgpu_vm_validate_pt_bos(p->adev, &fpriv->vm,
        p->bytes_moved_vis = 0;
 
        r = amdgpu_vm_validate_pt_bos(p->adev, &fpriv->vm,

-                                     amdgpu_cs_validate, p);
+                                     amdgpu_cs_bo_validate, p);

        if (r) {
                DRM_ERROR("amdgpu_vm_validate_pt_bos() failed.\n");
                goto error_validate;
        if (r) {
                DRM_ERROR("amdgpu_vm_validate_pt_bos() failed.\n");
                goto error_validate;


@@ -672,12 +657,12 @@ static int amdgpu_cs_sync_rings(struct amdgpu_cs_parser *p)
 }
 
 /**
 }
 
 /**

- * cs_parser_fini() - clean parser states
+ * amdgpu_cs_parser_fini() - clean parser states

  * @parser:    parser structure holding parsing context.
  * @error:     error number
  * @backoff:   indicator to backoff the reservation
  *
  * @parser:    parser structure holding parsing context.
  * @error:     error number
  * @backoff:   indicator to backoff the reservation
  *

- * If error is set than unvalidate buffer, otherwise just free memory
+ * If error is set then unvalidate buffer, otherwise just free memory

  * used by parsing context.
  **/
 static void amdgpu_cs_parser_fini(struct amdgpu_cs_parser *parser, int error,
  * used by parsing context.
  **/
 static void amdgpu_cs_parser_fini(struct amdgpu_cs_parser *parser, int error,


@@ -796,7 +781,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p)
        if (r)
                return r;
 
        if (r)
                return r;
 

-       r = amdgpu_vm_bo_update(adev, fpriv->prt_va, false);
+       r = amdgpu_vm_bo_update(adev, fpriv->prt_va, false, NULL);

        if (r)
                return r;
 
        if (r)
                return r;
 


@@ -807,7 +792,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p)
        if (amdgpu_mcbp || amdgpu_sriov_vf(adev)) {
                bo_va = fpriv->csa_va;
                BUG_ON(!bo_va);
        if (amdgpu_mcbp || amdgpu_sriov_vf(adev)) {
                bo_va = fpriv->csa_va;
                BUG_ON(!bo_va);

-               r = amdgpu_vm_bo_update(adev, bo_va, false);
+               r = amdgpu_vm_bo_update(adev, bo_va, false, NULL);

                if (r)
                        return r;
 
                if (r)
                        return r;
 


@@ -826,7 +811,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p)
                if (bo_va == NULL)
                        continue;
 
                if (bo_va == NULL)
                        continue;
 

-               r = amdgpu_vm_bo_update(adev, bo_va, false);
+               r = amdgpu_vm_bo_update(adev, bo_va, false, NULL);

                if (r)
                        return r;
 
                if (r)
                        return r;
 


@@ -1488,7 +1473,7 @@ int amdgpu_cs_fence_to_handle_ioctl(struct drm_device *dev, void *data,
 }
 
 /**
 }
 
 /**

- * amdgpu_cs_wait_all_fence - wait on all fences to signal
+ * amdgpu_cs_wait_all_fences - wait on all fences to signal

  *
  * @adev: amdgpu device
  * @filp: file private
  *
  * @adev: amdgpu device
  * @filp: file private


@@ -1639,7 +1624,7 @@ err_free_fences:
 }
 
 /**
 }
 
 /**

- * amdgpu_cs_find_bo_va - find bo_va for VM address
+ * amdgpu_cs_find_mapping - find bo_va for VM address

  *
  * @parser: command submission parser context
  * @addr: VM address
  *
  * @parser: command submission parser context
  * @addr: VM address