[PATCH 5/7] drm/amdgpu: update pt shadow while updating pt V2

[Chunming Zhou]

V2:
move shadow parameter to amdgpu_pte_update_params.

Change-Id: Ibc8fb4c5c9be38934ebd6d56f1cbd49cb82d53af
Signed-off-by: Chunming Zhou <david1.z...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index faf6cba..6c0028a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -66,6 +66,8 @@ struct amdgpu_pte_update_params {
        dma_addr_t *pages_addr;
        /* indirect buffer to fill with commands */
        struct amdgpu_ib *ib;
+       /* indicate upodate pt or its shadow */
+       bool shadow;
 };
 
 /**
@@ -752,7 +754,11 @@ static void amdgpu_vm_update_ptes(struct 
amdgpu_pte_update_params *params,
        addr = start;
        pt_idx = addr >> amdgpu_vm_block_size;
        pt = vm->page_tables[pt_idx].entry.robj;
-
+       if (params->shadow) {
+               if (!pt->shadow)
+                       return;
+               pt = vm->page_tables[pt_idx].entry.robj->shadow;
+       }
        if ((addr & ~mask) == (end & ~mask))
                nptes = end - addr;
        else
@@ -771,6 +777,11 @@ static void amdgpu_vm_update_ptes(struct 
amdgpu_pte_update_params *params,
        while (addr < end) {
                pt_idx = addr >> amdgpu_vm_block_size;
                pt = vm->page_tables[pt_idx].entry.robj;
+               if (params->shadow) {
+                       if (!pt->shadow)
+                               return;
+                       pt = vm->page_tables[pt_idx].entry.robj->shadow;
+               }
 
                if ((addr & ~mask) == (end & ~mask))
                        nptes = end - addr;
@@ -970,6 +981,9 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device 
*adev,
        if (r)
                goto error_free;
 
+       params.shadow = true;
+       amdgpu_vm_frag_ptes(&params, vm, start, last + 1, addr, flags);
+       params.shadow = false;
        amdgpu_vm_frag_ptes(&params, vm, start, last + 1, addr, flags);
 
        amdgpu_ring_pad_ib(ring, params.ib);
-- 
1.9.1

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