Re: [PATCH v7 03/16] drm/amdkfd: Split kfd suspend from device exit

[Andrey Grodzovsky <andrey.grodzovsky@xxxxxxx>]

On 2021-05-12 4:33 p.m., Felix Kuehling wrote:
> Am 2021-05-12 um 10:26 a.m. schrieb Andrey Grodzovsky:
> > Helps to expdite HW related stuff to amdgpu_pci_remove
> >
> > Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@xxxxxxx>
> > ---
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 2 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 +-
> >   drivers/gpu/drm/amd/amdkfd/kfd_device.c    | 3 ++-
> >   3 files changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> > index 5f6696a3c778..2b06dee9a0ce 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> > @@ -170,7 +170,7 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)
> >   	}
> >   }
> >   
> > -void amdgpu_amdkfd_device_fini(struct amdgpu_device *adev)
> > +void amdgpu_amdkfd_device_fini_sw(struct amdgpu_device *adev)
>
> You're renaming this function, but I don't see you fixing up any of the
> callers. Looks like you do that in the next patch. So this patch breaks
> the build, the next one fixes it. Maybe you need to refactor this or
> just squash the two patches.

Will do.

Andrey

> Regards,
>    Felix
>
>
> >   {
> >   	if (adev->kfd.dev) {
> >   		kgd2kfd_device_exit(adev->kfd.dev);
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> > index 14f68c028126..f8e10af99c28 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> > @@ -127,7 +127,7 @@ void amdgpu_amdkfd_interrupt(struct amdgpu_device *adev,
> >   			const void *ih_ring_entry);
> >   void amdgpu_amdkfd_device_probe(struct amdgpu_device *adev);
> >   void amdgpu_amdkfd_device_init(struct amdgpu_device *adev);
> > -void amdgpu_amdkfd_device_fini(struct amdgpu_device *adev);
> > +void amdgpu_amdkfd_device_fini_sw(struct amdgpu_device *adev);
> >   int amdgpu_amdkfd_submit_ib(struct kgd_dev *kgd, enum kgd_engine_type engine,
> >   				uint32_t vmid, uint64_t gpu_addr,
> >   				uint32_t *ib_cmd, uint32_t ib_len);
> > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> > index 357b9bf62a1c..ab6d2a43c9a3 100644
> > --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> > @@ -858,10 +858,11 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
> >   	return kfd->init_complete;
> >   }
> >   
> > +
> > +
> >   void kgd2kfd_device_exit(struct kfd_dev *kfd)
> >   {
> >   	if (kfd->init_complete) {
> > -		kgd2kfd_suspend(kfd, false);
> >   		device_queue_manager_uninit(kfd->dqm);
> >   		kfd_interrupt_exit(kfd);
> >   		kfd_topology_remove_device(kfd);