drm/amdgpu: add a VM mapping replace operation v2

Add a new operation to replace mappings in a VM with a new one.

v2: Fix Jerry's comment, separate out clear operation.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 14 insertions, 1 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index b311b389bd5a..c71c087727b8 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -544,7 +544,8 @@ static void amdgpu_gem_va_update_vm(struct amdgpu_device *adev,
         if (r)
                 goto error;
 
-        if (operation == AMDGPU_VA_OP_MAP)
+        if (operation == AMDGPU_VA_OP_MAP ||
+            operation == AMDGPU_VA_OP_REPLACE)
                 r = amdgpu_vm_bo_update(adev, bo_va, false);
 
 error:
@@ -595,6 +596,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
         case AMDGPU_VA_OP_MAP:
         case AMDGPU_VA_OP_UNMAP:
         case AMDGPU_VA_OP_CLEAR:
+        case AMDGPU_VA_OP_REPLACE:
                 break;
         default:
                 dev_err(&dev->pdev->dev, "unsupported operation %d\n",
@@ -656,6 +658,17 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
                                                 args->va_address,
                                                 args->map_size);
                 break;
+        case AMDGPU_VA_OP_REPLACE:
+                r = amdgpu_vm_alloc_pts(adev, bo_va->vm, args->va_address,
+                                        args->map_size);
+                if (r)
+                        goto error_backoff;
+
+                va_flags = amdgpu_vm_get_pte_flags(adev, args->flags);
+                r = amdgpu_vm_bo_replace_map(adev, bo_va, args->va_address,
+                                             args->offset_in_bo, args->map_size,
+                                             va_flags);
+                break;
         default:
                 break;
         }