drm/radeon: sync PT updates as shared v2
authorChristian König <christian.koenig@amd.com>
Wed, 19 Nov 2014 13:01:28 +0000 (14:01 +0100)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 20 Nov 2014 18:00:19 +0000 (13:00 -0500)
Only invalidating PTEs needs to be executed synchronized to using the PT.

v2: fix sync to uses

Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/radeon/radeon_vm.c

index 470451c1de62173fde9cb48f9d3f511164345fbf..0b10f3a03ce2f20ac66103c932f4d6a51c8fd743 100644 (file)
@@ -820,7 +820,7 @@ static void radeon_vm_update_ptes(struct radeon_device *rdev,
                unsigned nptes;
                uint64_t pte;
 
-               radeon_sync_resv(rdev, &ib->sync, pt->tbo.resv, false);
+               radeon_sync_resv(rdev, &ib->sync, pt->tbo.resv, true);
 
                if ((addr & ~mask) == (end & ~mask))
                        nptes = end - addr;
@@ -980,6 +980,13 @@ int radeon_vm_bo_update(struct radeon_device *rdev,
                return r;
        ib.length_dw = 0;
 
+       if (!(bo_va->flags & RADEON_VM_PAGE_VALID)) {
+               unsigned i;
+
+               for (i = 0; i < RADEON_NUM_RINGS; ++i)
+                       radeon_sync_fence(&ib.sync, vm->ids[i].last_id_use);
+       }
+
        radeon_vm_update_ptes(rdev, vm, &ib, bo_va->it.start,
                              bo_va->it.last + 1, addr,
                              radeon_vm_page_flags(bo_va->flags));