mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
drm/amdgpu: sync fence of clear_invalids (v2)
bo_va may un-initialized, fix it. Signed-off-by: monk.liu <monk.liu@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Reviewed-by: Jammy Zhou <jammy.zhou@amd.com>
This commit is contained in:
parent
3d5a08c114
commit
cfe2c97807
3 changed files with 6 additions and 4 deletions
|
@ -2268,7 +2268,7 @@ int amdgpu_vm_update_page_directory(struct amdgpu_device *adev,
|
||||||
int amdgpu_vm_clear_freed(struct amdgpu_device *adev,
|
int amdgpu_vm_clear_freed(struct amdgpu_device *adev,
|
||||||
struct amdgpu_vm *vm);
|
struct amdgpu_vm *vm);
|
||||||
int amdgpu_vm_clear_invalids(struct amdgpu_device *adev,
|
int amdgpu_vm_clear_invalids(struct amdgpu_device *adev,
|
||||||
struct amdgpu_vm *vm);
|
struct amdgpu_vm *vm, struct amdgpu_sync *sync);
|
||||||
int amdgpu_vm_bo_update(struct amdgpu_device *adev,
|
int amdgpu_vm_bo_update(struct amdgpu_device *adev,
|
||||||
struct amdgpu_bo_va *bo_va,
|
struct amdgpu_bo_va *bo_va,
|
||||||
struct ttm_mem_reg *mem);
|
struct ttm_mem_reg *mem);
|
||||||
|
|
|
@ -520,7 +520,7 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p,
|
||||||
|
|
||||||
amdgpu_sync_fence(&p->ibs[0].sync, bo_va->last_pt_update);
|
amdgpu_sync_fence(&p->ibs[0].sync, bo_va->last_pt_update);
|
||||||
}
|
}
|
||||||
return amdgpu_vm_clear_invalids(adev, vm);
|
return amdgpu_vm_clear_invalids(adev, vm, &p->ibs[0].sync);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int amdgpu_cs_ib_vm_chunk(struct amdgpu_device *adev,
|
static int amdgpu_cs_ib_vm_chunk(struct amdgpu_device *adev,
|
||||||
|
|
|
@ -858,9 +858,9 @@ int amdgpu_vm_clear_freed(struct amdgpu_device *adev,
|
||||||
* PTs have to be reserved and mutex must be locked!
|
* PTs have to be reserved and mutex must be locked!
|
||||||
*/
|
*/
|
||||||
int amdgpu_vm_clear_invalids(struct amdgpu_device *adev,
|
int amdgpu_vm_clear_invalids(struct amdgpu_device *adev,
|
||||||
struct amdgpu_vm *vm)
|
struct amdgpu_vm *vm, struct amdgpu_sync *sync)
|
||||||
{
|
{
|
||||||
struct amdgpu_bo_va *bo_va;
|
struct amdgpu_bo_va *bo_va = NULL;
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
spin_lock(&vm->status_lock);
|
spin_lock(&vm->status_lock);
|
||||||
|
@ -877,6 +877,8 @@ int amdgpu_vm_clear_invalids(struct amdgpu_device *adev,
|
||||||
}
|
}
|
||||||
spin_unlock(&vm->status_lock);
|
spin_unlock(&vm->status_lock);
|
||||||
|
|
||||||
|
if (bo_va)
|
||||||
|
amdgpu_sync_fence(sync, bo_va->last_pt_update);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue