[AMD Official Use Only] Thanks Christian, I found some more issues as well, I will update and resend again.
-----Original Message----- From: Koenig, Christian <[email protected]> Sent: Wednesday, May 26, 2021 2:03 PM To: Das, Nirmoy <[email protected]>; [email protected] Cc: Deucher, Alexander <[email protected]> Subject: Re: [PATCH 2/7] drm/amdgpu: move shadow bo validation to VM code Am 26.05.21 um 12:10 schrieb Nirmoy Das: > Do the shadow bo validation in the VM code as VM code knows/owns > shadow BOs. > > Signed-off-by: Nirmoy Das <[email protected]> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 23 ++++------------------- > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 5 +++++ > 2 files changed, 9 insertions(+), 19 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c > index 90136f9dedd6..f6a8f0c5a52f 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c > @@ -396,10 +396,10 @@ void amdgpu_cs_report_moved_bytes(struct amdgpu_device > *adev, u64 num_bytes, > spin_unlock(&adev->mm_stats.lock); > } > > -static int amdgpu_cs_bo_validate(struct amdgpu_cs_parser *p, > - struct amdgpu_bo *bo) > +static int amdgpu_cs_bo_validate(void *param, struct amdgpu_bo *bo) > { > struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev); > + struct amdgpu_cs_parser *p = param; > struct ttm_operation_ctx ctx = { > .interruptible = true, > .no_wait_gpu = false, > @@ -451,21 +451,6 @@ static int amdgpu_cs_bo_validate(struct amdgpu_cs_parser > *p, > return r; > } > > -static int amdgpu_cs_validate(void *param, struct amdgpu_bo *bo) -{ > - struct amdgpu_cs_parser *p = param; > - int r; > - > - r = amdgpu_cs_bo_validate(p, bo); > - if (r) > - return r; > - > - if (bo->shadow) > - r = amdgpu_cs_bo_validate(p, bo->shadow); > - > - return r; > -} > - > static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p, > struct list_head *validated) > { > @@ -493,7 +478,7 @@ static int amdgpu_cs_list_validate(struct > amdgpu_cs_parser *p, > lobj->user_pages); > } > > - r = amdgpu_cs_validate(p, bo); > + r = amdgpu_cs_bo_validate(p, bo); > if (r) > return r; > > @@ -593,7 +578,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser > *p, > p->bytes_moved_vis = 0; > > r = amdgpu_vm_validate_pt_bos(p->adev, &fpriv->vm, > - amdgpu_cs_validate, p); > + amdgpu_cs_bo_validate, p); > if (r) { > DRM_ERROR("amdgpu_vm_validate_pt_bos() failed.\n"); > goto error_validate; > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > index da155c276c51..f474f15ba344 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > @@ -696,6 +696,11 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device > *adev, struct amdgpu_vm *vm, > r = validate(param, bo); > if (r) > return r; > + if (bo->shadow) { > + r = validate(param, bo); This needs to be "validate(param, bo->shadow)". Apart from that looks good to me. Christian. > + if (r) > + return r; > + } > > if (bo->tbo.type != ttm_bo_type_kernel) { > amdgpu_vm_bo_moved(bo_base); _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
