Am 11.09.2018 um 17:13 schrieb Andrey Grodzovsky: > After GPU reset amdgpu_vm_clear_bo triggers VM flush > but job->vm_pd_addr is not set causing SDMA TO. > > v2: > Per advise by Christian König avoid flushing VM for jobs where > job->vm_pd_addr wasn't explicitly set. > > v3: > Shortcut vm_flush_needed early. > > Fixes cbd5285 drm/amdgpu: move setting the GART addr into TTM. > Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky at amd.com> Reviewed-by: Christian König <christian.koenig at amd.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 1 + > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 3 ++- > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c > index 34e54d4..755f733 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c > @@ -73,6 +73,7 @@ int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs, > amdgpu_sync_create(&(*job)->sync); > amdgpu_sync_create(&(*job)->sched_sync); > (*job)->vram_lost_counter = atomic_read(&adev->vram_lost_counter); > + (*job)->vm_pd_addr = AMDGPU_BO_INVALID_OFFSET; > > return 0; > } > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > index f5a9600..f5fdbb6 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > @@ -852,7 +852,8 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job, bool need_ > } > > gds_switch_needed &= !!ring->funcs->emit_gds_switch; > - vm_flush_needed &= !!ring->funcs->emit_vm_flush; > + vm_flush_needed &= !!ring->funcs->emit_vm_flush && > + job->vm_pd_addr != AMDGPU_BO_INVALID_OFFSET; > pasid_mapping_needed &= adev->gmc.gmc_funcs->emit_pasid_mapping && > ring->funcs->emit_wreg; >
