On Tue, Nov 24, 2020 at 10:51:57AM -0500, Andrey Grodzovsky wrote:
>
> On 11/24/20 9:53 AM, Daniel Vetter wrote:
> > On Sat, Nov 21, 2020 at 12:21:18AM -0500, Andrey Grodzovsky wrote:
> > > Some of the stuff in amdgpu_device_fini such as HW interrupts
> > > disable and pending fences finilization must be done right away on
> > > pci_remove while most of the stuff which relates to finilizing and
> > > releasing driver data structures can be kept until
> > > drm_driver.release hook is called, i.e. when the last device
> > > reference is dropped.
> > >
> > Uh fini_late and fini_early are rathare meaningless namings, since no
> > clear why there's a split. If you used drm_connector_funcs as inspiration,
> > that's kinda not good because 'register' itself is a reserved keyword.
> > That's why we had to add late_ prefix, could as well have used
> > C_sucks_ as prefix :-) And then the early_unregister for consistency.
> >
> > I think fini_hw and fini_sw (or maybe fini_drm) would be a lot clearer
> > about what they're doing.
> >
> > I still strongly recommend that you cut over as much as possible of the
> > fini_hw work to devm_ and for the fini_sw/drm stuff there's drmm_
> > -Daniel
>
>
> Definitely, and I put it in a TODO list in the RFC patch.Also, as I
> mentioned before -
> I just prefer to leave it for a follow up work because it's non trivial and
> requires shuffling
> a lof of stuff around in the driver. I was thinking of committing the work
> in incremental steps -
> so it's easier to merge it and control for breakages.
Yeah doing devm/drmm conversion later on makes sense. It'd still try to
have better names than what you're currently going with. A few of these
will likely stick around for very long, not just interim.
-Daniel
>
> Andrey
>
>
> >
> > > Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@xxxxxxx>
> > > ---
> > > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 6 +++++-
> > > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 16 ++++++++++++----
> > > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 7 ++-----
> > > drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 15 ++++++++++++++-
> > > drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 24 +++++++++++++++---------
> > > drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 1 +
> > > drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 12 +++++++++++-
> > > drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 +++
> > > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 3 ++-
> > > 9 files changed, 65 insertions(+), 22 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> > > index 83ac06a..6243f6d 100644
> > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> > > @@ -1063,7 +1063,9 @@ static inline struct amdgpu_device *amdgpu_ttm_adev(struct ttm_bo_device *bdev)
> > > int amdgpu_device_init(struct amdgpu_device *adev,
> > > uint32_t flags);
> > > -void amdgpu_device_fini(struct amdgpu_device *adev);
> > > +void amdgpu_device_fini_early(struct amdgpu_device *adev);
> > > +void amdgpu_device_fini_late(struct amdgpu_device *adev);
> > > +
> > > int amdgpu_gpu_wait_for_idle(struct amdgpu_device *adev);
> > > void amdgpu_device_vram_access(struct amdgpu_device *adev, loff_t pos,
> > > @@ -1275,6 +1277,8 @@ void amdgpu_driver_lastclose_kms(struct drm_device *dev);
> > > int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv);
> > > void amdgpu_driver_postclose_kms(struct drm_device *dev,
> > > struct drm_file *file_priv);
> > > +void amdgpu_driver_release_kms(struct drm_device *dev);
> > > +
> > > int amdgpu_device_ip_suspend(struct amdgpu_device *adev);
> > > int amdgpu_device_suspend(struct drm_device *dev, bool fbcon);
> > > int amdgpu_device_resume(struct drm_device *dev, bool fbcon);
> > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > > index 2f60b70..797d94d 100644
> > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > > @@ -3557,14 +3557,12 @@ int amdgpu_device_init(struct amdgpu_device *adev,
> > > * Tear down the driver info (all asics).
> > > * Called at driver shutdown.
> > > */
> > > -void amdgpu_device_fini(struct amdgpu_device *adev)
> > > +void amdgpu_device_fini_early(struct amdgpu_device *adev)
> > > {
> > > dev_info(adev->dev, "amdgpu: finishing device.\n");
> > > flush_delayed_work(&adev->delayed_init_work);
> > > adev->shutdown = true;
> > > - kfree(adev->pci_state);
> > > -
> > > /* make sure IB test finished before entering exclusive mode
> > > * to avoid preemption on IB test
> > > * */
> > > @@ -3581,11 +3579,18 @@ void amdgpu_device_fini(struct amdgpu_device *adev)
> > > else
> > > drm_atomic_helper_shutdown(adev_to_drm(adev));
> > > }
> > > - amdgpu_fence_driver_fini(adev);
> > > + amdgpu_fence_driver_fini_early(adev);
> > > if (adev->pm_sysfs_en)
> > > amdgpu_pm_sysfs_fini(adev);
> > > amdgpu_fbdev_fini(adev);
> > > +
> > > + amdgpu_irq_fini_early(adev);
> > > +}
> > > +
> > > +void amdgpu_device_fini_late(struct amdgpu_device *adev)
> > > +{
> > > amdgpu_device_ip_fini(adev);
> > > + amdgpu_fence_driver_fini_late(adev);
> > > release_firmware(adev->firmware.gpu_info_fw);
> > > adev->firmware.gpu_info_fw = NULL;
> > > adev->accel_working = false;
> > > @@ -3621,6 +3626,9 @@ void amdgpu_device_fini(struct amdgpu_device *adev)
> > > amdgpu_pmu_fini(adev);
> > > if (adev->mman.discovery_bin)
> > > amdgpu_discovery_fini(adev);
> > > +
> > > + kfree(adev->pci_state);
> > > +
> > > }
> > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> > > index 7f98cf1..3d130fc 100644
> > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> > > @@ -1244,14 +1244,10 @@ amdgpu_pci_remove(struct pci_dev *pdev)
> > > {
> > > struct drm_device *dev = pci_get_drvdata(pdev);
> > > -#ifdef MODULE
> > > - if (THIS_MODULE->state != MODULE_STATE_GOING)
> > > -#endif
> > > - DRM_ERROR("Hotplug removal is not supported\n");
> > > drm_dev_unplug(dev);
> > > amdgpu_driver_unload_kms(dev);
> > > +
> > > pci_disable_device(pdev);
> > > - pci_set_drvdata(pdev, NULL);
> > > drm_dev_put(dev);
> > > }
> > > @@ -1557,6 +1553,7 @@ static struct drm_driver kms_driver = {
> > > .dumb_create = amdgpu_mode_dumb_create,
> > > .dumb_map_offset = amdgpu_mode_dumb_mmap,
> > > .fops = &amdgpu_driver_kms_fops,
> > > + .release = &amdgpu_driver_release_kms,
> > > .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
> > > .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
> > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
> > > index d0b0021..c123aa6 100644
> > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
> > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
> > > @@ -523,7 +523,7 @@ int amdgpu_fence_driver_init(struct amdgpu_device *adev)
> > > *
> > > * Tear down the fence driver for all possible rings (all asics).
> > > */
> > > -void amdgpu_fence_driver_fini(struct amdgpu_device *adev)
> > > +void amdgpu_fence_driver_fini_early(struct amdgpu_device *adev)
> > > {
> > > unsigned i, j;
> > > int r;
> > > @@ -544,6 +544,19 @@ void amdgpu_fence_driver_fini(struct amdgpu_device *adev)
> > > if (!ring->no_scheduler)
> > > drm_sched_fini(&ring->sched);
> > > del_timer_sync(&ring->fence_drv.fallback_timer);
> > > + }
> > > +}
> > > +
> > > +void amdgpu_fence_driver_fini_late(struct amdgpu_device *adev)
> > > +{
> > > + unsigned int i, j;
> > > +
> > > + for (i = 0; i < AMDGPU_MAX_RINGS; i++) {
> > > + struct amdgpu_ring *ring = adev->rings[i];
> > > +
> > > + if (!ring || !ring->fence_drv.initialized)
> > > + continue;
> > > +
> > > for (j = 0; j <= ring->fence_drv.num_fences_mask; ++j)
> > > dma_fence_put(ring->fence_drv.fences[j]);
> > > kfree(ring->fence_drv.fences);
> > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
> > > index 300ac73..a833197 100644
> > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
> > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
> > > @@ -49,6 +49,7 @@
> > > #include <drm/drm_irq.h>
> > > #include <drm/drm_vblank.h>
> > > #include <drm/amdgpu_drm.h>
> > > +#include <drm/drm_drv.h>
> > > #include "amdgpu.h"
> > > #include "amdgpu_ih.h"
> > > #include "atom.h"
> > > @@ -297,6 +298,20 @@ int amdgpu_irq_init(struct amdgpu_device *adev)
> > > return 0;
> > > }
> > > +
> > > +void amdgpu_irq_fini_early(struct amdgpu_device *adev)
> > > +{
> > > + if (adev->irq.installed) {
> > > + drm_irq_uninstall(&adev->ddev);
> > > + adev->irq.installed = false;
> > > + if (adev->irq.msi_enabled)
> > > + pci_free_irq_vectors(adev->pdev);
> > > +
> > > + if (!amdgpu_device_has_dc_support(adev))
> > > + flush_work(&adev->hotplug_work);
> > > + }
> > > +}
> > > +
> > > /**
> > > * amdgpu_irq_fini - shut down interrupt handling
> > > *
> > > @@ -310,15 +325,6 @@ void amdgpu_irq_fini(struct amdgpu_device *adev)
> > > {
> > > unsigned i, j;
> > > - if (adev->irq.installed) {
> > > - drm_irq_uninstall(adev_to_drm(adev));
> > > - adev->irq.installed = false;
> > > - if (adev->irq.msi_enabled)
> > > - pci_free_irq_vectors(adev->pdev);
> > > - if (!amdgpu_device_has_dc_support(adev))
> > > - flush_work(&adev->hotplug_work);
> > > - }
> > > -
> > > for (i = 0; i < AMDGPU_IRQ_CLIENTID_MAX; ++i) {
> > > if (!adev->irq.client[i].sources)
> > > continue;
> > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h
> > > index c718e94..718c70f 100644
> > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h
> > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h
> > > @@ -104,6 +104,7 @@ irqreturn_t amdgpu_irq_handler(int irq, void *arg);
> > > int amdgpu_irq_init(struct amdgpu_device *adev);
> > > void amdgpu_irq_fini(struct amdgpu_device *adev);
> > > +void amdgpu_irq_fini_early(struct amdgpu_device *adev);
> > > int amdgpu_irq_add_id(struct amdgpu_device *adev,
> > > unsigned client_id, unsigned src_id,
> > > struct amdgpu_irq_src *source);
> > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> > > index a0af8a7..9e30c5c 100644
> > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> > > @@ -29,6 +29,7 @@
> > > #include "amdgpu.h"
> > > #include <drm/drm_debugfs.h>
> > > #include <drm/amdgpu_drm.h>
> > > +#include <drm/drm_drv.h>
> > > #include "amdgpu_sched.h"
> > > #include "amdgpu_uvd.h"
> > > #include "amdgpu_vce.h"
> > > @@ -94,7 +95,7 @@ void amdgpu_driver_unload_kms(struct drm_device *dev)
> > > }
> > > amdgpu_acpi_fini(adev);
> > > - amdgpu_device_fini(adev);
> > > + amdgpu_device_fini_early(adev);
> > > }
> > > void amdgpu_register_gpu_instance(struct amdgpu_device *adev)
> > > @@ -1147,6 +1148,15 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev,
> > > pm_runtime_put_autosuspend(dev->dev);
> > > }
> > > +
> > > +void amdgpu_driver_release_kms(struct drm_device *dev)
> > > +{
> > > + struct amdgpu_device *adev = drm_to_adev(dev);
> > > +
> > > + amdgpu_device_fini_late(adev);
> > > + pci_set_drvdata(adev->pdev, NULL);
> > > +}
> > > +
> > > /*
> > > * VBlank related functions.
> > > */
> > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> > > index 9d11b84..caf828a 100644
> > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> > > @@ -2142,9 +2142,12 @@ int amdgpu_ras_pre_fini(struct amdgpu_device *adev)
> > > {
> > > struct amdgpu_ras *con = amdgpu_ras_get_context(adev);
> > > + //DRM_ERROR("adev 0x%llx", (long long unsigned int)adev);
> > > +
> > > if (!con)
> > > return 0;
> > > +
> > > /* Need disable ras on all IPs here before ip [hw/sw]fini */
> > > amdgpu_ras_disable_all_features(adev, 0);
> > > amdgpu_ras_recovery_fini(adev);
> > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
> > > index 7112137..074f36b 100644
> > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
> > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
> > > @@ -107,7 +107,8 @@ struct amdgpu_fence_driver {
> > > };
> > > int amdgpu_fence_driver_init(struct amdgpu_device *adev);
> > > -void amdgpu_fence_driver_fini(struct amdgpu_device *adev);
> > > +void amdgpu_fence_driver_fini_early(struct amdgpu_device *adev);
> > > +void amdgpu_fence_driver_fini_late(struct amdgpu_device *adev);
> > > void amdgpu_fence_driver_force_completion(struct amdgpu_ring *ring);
> > > int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring,
> > > --
> > > 2.7.4
> > >
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
