diff options
| author | monk.liu <monk.liu@amd.com> | 2015-05-26 15:01:54 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2015-06-03 21:03:54 -0400 |
| commit | cfe2c9780756b63af695078c110b755876b09dfc (patch) | |
| tree | dfddee7a85eddfd3ec9d3aafe54821c31ecdc424 /drivers/gpu | |
| parent | 3d5a08c114585e5b9f890807b04d2730dafde5e1 (diff) | |
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 8eb5c5529304..6c8c24ba463d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -2268,7 +2268,7 @@ int amdgpu_vm_update_page_directory(struct amdgpu_device *adev, int amdgpu_vm_clear_freed(struct amdgpu_device *adev, struct amdgpu_vm *vm); 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, struct amdgpu_bo_va *bo_va, struct ttm_mem_reg *mem); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index ecb30a1a73cc..fefa48a59a7d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -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); } - 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, diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index dcb2d3859cf1..4d26b303b495 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -858,9 +858,9 @@ int amdgpu_vm_clear_freed(struct amdgpu_device *adev, * PTs have to be reserved and mutex must be locked! */ 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; spin_lock(&vm->status_lock); @@ -877,6 +877,8 @@ int amdgpu_vm_clear_invalids(struct amdgpu_device *adev, } spin_unlock(&vm->status_lock); + if (bo_va) + amdgpu_sync_fence(sync, bo_va->last_pt_update); return 0; } |