Re: [PATCH v6 06/16] drm/amdgpu: Handle IOMMU enabled case.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 





On 2021-05-11 2:44 a.m., Christian König wrote:
Am 10.05.21 um 18:36 schrieb Andrey Grodzovsky:
Handle all DMA IOMMU gropup related dependencies before the
group is removed.

v5: Drop IOMMU notifier and switch to lockless call to ttm_tt_unpopulate
v6: Drop the BO unamp list

Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@xxxxxxx>
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++--
  drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c   | 3 +--
  drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h   | 1 +
  drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c    | 9 +++++++++
  drivers/gpu/drm/amd/amdgpu/cik_ih.c        | 1 -
  drivers/gpu/drm/amd/amdgpu/cz_ih.c         | 1 -
  drivers/gpu/drm/amd/amdgpu/iceland_ih.c    | 1 -
  drivers/gpu/drm/amd/amdgpu/navi10_ih.c     | 3 ---
  drivers/gpu/drm/amd/amdgpu/si_ih.c         | 1 -
  drivers/gpu/drm/amd/amdgpu/tonga_ih.c      | 1 -
  drivers/gpu/drm/amd/amdgpu/vega10_ih.c     | 3 ---
  11 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 18598eda18f6..a0bff4713672 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3256,7 +3256,6 @@ static const struct attribute *amdgpu_dev_attributes[] = {
      NULL
  };
-
  /**
   * amdgpu_device_init - initialize the driver
   *
@@ -3698,12 +3697,13 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev)
          amdgpu_ucode_sysfs_fini(adev);
      sysfs_remove_files(&adev->dev->kobj, amdgpu_dev_attributes);
-
      amdgpu_fbdev_fini(adev);
      amdgpu_irq_fini_hw(adev);
      amdgpu_device_ip_fini_early(adev);
+
+    amdgpu_gart_dummy_page_fini(adev);

I think you should probably just call amdgpu_gart_fini() here.

  }
  void amdgpu_device_fini_sw(struct amdgpu_device *adev)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
index c5a9a4fb10d2..354e68081b53 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
@@ -92,7 +92,7 @@ static int amdgpu_gart_dummy_page_init(struct amdgpu_device *adev)
   *
   * Frees the dummy page used by the driver (all asics).
   */
-static void amdgpu_gart_dummy_page_fini(struct amdgpu_device *adev)
+void amdgpu_gart_dummy_page_fini(struct amdgpu_device *adev)
  {
      if (!adev->dummy_page_addr)
          return;
@@ -375,5 +375,4 @@ int amdgpu_gart_init(struct amdgpu_device *adev)
   */
  void amdgpu_gart_fini(struct amdgpu_device *adev)
  {
-    amdgpu_gart_dummy_page_fini(adev);
  }

Well either you remove amdgpu_gart_fini() or just call amdgpu_gart_fini() instead of amdgpu_gart_dummy_page_fini().

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h
index a25fe97b0196..78dc7a23da56 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h
@@ -58,6 +58,7 @@ int amdgpu_gart_table_vram_pin(struct amdgpu_device *adev);
  void amdgpu_gart_table_vram_unpin(struct amdgpu_device *adev);
  int amdgpu_gart_init(struct amdgpu_device *adev);
  void amdgpu_gart_fini(struct amdgpu_device *adev);
+void amdgpu_gart_dummy_page_fini(struct amdgpu_device *adev);
  int amdgpu_gart_unbind(struct amdgpu_device *adev, uint64_t offset,
                 int pages);
  int amdgpu_gart_map(struct amdgpu_device *adev, uint64_t offset,
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
index 233b64dab94b..a14973a7a9c9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
@@ -361,6 +361,15 @@ void amdgpu_irq_fini_hw(struct amdgpu_device *adev)
          if (!amdgpu_device_has_dc_support(adev))
              flush_work(&adev->hotplug_work);
      }
+
+    if (adev->irq.ih_soft.ring)
+        amdgpu_ih_ring_fini(adev, &adev->irq.ih_soft);
+    if (adev->irq.ih.ring)
+        amdgpu_ih_ring_fini(adev, &adev->irq.ih);
+    if (adev->irq.ih1.ring)
+        amdgpu_ih_ring_fini(adev, &adev->irq.ih1);
+    if (adev->irq.ih2.ring)
+        amdgpu_ih_ring_fini(adev, &adev->irq.ih2);

You should probably make the function NULL save instead of checking here.

Christian.

Agree, in fact it's already does this check inside amdgpu_ih_ring_fini
so I will just drop the checks.

Andrey


  }
  /**
diff --git a/drivers/gpu/drm/amd/amdgpu/cik_ih.c b/drivers/gpu/drm/amd/amdgpu/cik_ih.c
index 183d44a6583c..df385ffc9768 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik_ih.c
@@ -310,7 +310,6 @@ static int cik_ih_sw_fini(void *handle)
      struct amdgpu_device *adev = (struct amdgpu_device *)handle;
      amdgpu_irq_fini_sw(adev);
-    amdgpu_ih_ring_fini(adev, &adev->irq.ih);
      amdgpu_irq_remove_domain(adev);
      return 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/cz_ih.c b/drivers/gpu/drm/amd/amdgpu/cz_ih.c
index d32743949003..b8c47e0cf37a 100644
--- a/drivers/gpu/drm/amd/amdgpu/cz_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/cz_ih.c
@@ -302,7 +302,6 @@ static int cz_ih_sw_fini(void *handle)
      struct amdgpu_device *adev = (struct amdgpu_device *)handle;
      amdgpu_irq_fini_sw(adev);
-    amdgpu_ih_ring_fini(adev, &adev->irq.ih);
      amdgpu_irq_remove_domain(adev);
      return 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/iceland_ih.c b/drivers/gpu/drm/amd/amdgpu/iceland_ih.c
index da96c6013477..ddfe4eaeea05 100644
--- a/drivers/gpu/drm/amd/amdgpu/iceland_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/iceland_ih.c
@@ -301,7 +301,6 @@ static int iceland_ih_sw_fini(void *handle)
      struct amdgpu_device *adev = (struct amdgpu_device *)handle;
      amdgpu_irq_fini_sw(adev);
-    amdgpu_ih_ring_fini(adev, &adev->irq.ih);
      amdgpu_irq_remove_domain(adev);
      return 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/navi10_ih.c b/drivers/gpu/drm/amd/amdgpu/navi10_ih.c
index 5eea4550b856..e171a9e78544 100644
--- a/drivers/gpu/drm/amd/amdgpu/navi10_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/navi10_ih.c
@@ -571,9 +571,6 @@ static int navi10_ih_sw_fini(void *handle)
      amdgpu_irq_fini_sw(adev);
      amdgpu_ih_ring_fini(adev, &adev->irq.ih_soft);
-    amdgpu_ih_ring_fini(adev, &adev->irq.ih2);
-    amdgpu_ih_ring_fini(adev, &adev->irq.ih1);
-    amdgpu_ih_ring_fini(adev, &adev->irq.ih);
      return 0;
  }
diff --git a/drivers/gpu/drm/amd/amdgpu/si_ih.c b/drivers/gpu/drm/amd/amdgpu/si_ih.c
index 751307f3252c..9a24f17a5750 100644
--- a/drivers/gpu/drm/amd/amdgpu/si_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/si_ih.c
@@ -176,7 +176,6 @@ static int si_ih_sw_fini(void *handle)
      struct amdgpu_device *adev = (struct amdgpu_device *)handle;
      amdgpu_irq_fini_sw(adev);
-    amdgpu_ih_ring_fini(adev, &adev->irq.ih);
      return 0;
  }
diff --git a/drivers/gpu/drm/amd/amdgpu/tonga_ih.c b/drivers/gpu/drm/amd/amdgpu/tonga_ih.c
index 973d80ec7f6c..b08905d1c00f 100644
--- a/drivers/gpu/drm/amd/amdgpu/tonga_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/tonga_ih.c
@@ -313,7 +313,6 @@ static int tonga_ih_sw_fini(void *handle)
      struct amdgpu_device *adev = (struct amdgpu_device *)handle;
      amdgpu_irq_fini_sw(adev);
-    amdgpu_ih_ring_fini(adev, &adev->irq.ih);
      amdgpu_irq_remove_domain(adev);
      return 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
index dead9c2fbd4c..d78b8abe993a 100644
--- a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
@@ -515,9 +515,6 @@ static int vega10_ih_sw_fini(void *handle)
      amdgpu_irq_fini_sw(adev);
      amdgpu_ih_ring_fini(adev, &adev->irq.ih_soft);
-    amdgpu_ih_ring_fini(adev, &adev->irq.ih2);
-    amdgpu_ih_ring_fini(adev, &adev->irq.ih1);
-    amdgpu_ih_ring_fini(adev, &adev->irq.ih);
      return 0;
  }




[Index of Archives]     [Linux DRI Users]     [Linux Intel Graphics]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux