drm/amdgpu: move amdgpu_doorbell_get_kfd_info to amdgpu_amdkfd.c

It's the only place it's used.

Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 941535d94f87742a7d4aedc02ab13044ea5b78ad..b03f9242448c623da47d4dcb5af7aa92bb86a2f5 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -651,12 +651,6 @@ typedef enum _AMDGPU_DOORBELL64_ASSIGNMENT
        AMDGPU_DOORBELL64_INVALID                 = 0xFFFF
 } AMDGPU_DOORBELL64_ASSIGNMENT;
 
-
-void amdgpu_doorbell_get_kfd_info(struct amdgpu_device *adev,
-                               phys_addr_t *aperture_base,
-                               size_t *aperture_size,
-                               size_t *start_offset);
-
 /*
  * IRQS.
  */

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index c70cda04dbfb921a026313924b9f98c4e83e6904..896b16db58aac5f3d15adecd075ae14adaedd721 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -93,6 +93,39 @@ void amdgpu_amdkfd_device_probe(struct amdgpu_device *adev)
                                   adev->pdev, kfd2kgd);
 }
 
+/**
+ * amdgpu_doorbell_get_kfd_info - Report doorbell configuration required to
+ *                                setup amdkfd
+ *
+ * @adev: amdgpu_device pointer
+ * @aperture_base: output returning doorbell aperture base physical address
+ * @aperture_size: output returning doorbell aperture size in bytes
+ * @start_offset: output returning # of doorbell bytes reserved for amdgpu.
+ *
+ * amdgpu and amdkfd share the doorbell aperture. amdgpu sets it up,
+ * takes doorbells required for its own rings and reports the setup to amdkfd.
+ * amdgpu reserved doorbells are at the start of the doorbell aperture.
+ */
+static void amdgpu_doorbell_get_kfd_info(struct amdgpu_device *adev,
+                                        phys_addr_t *aperture_base,
+                                        size_t *aperture_size,
+                                        size_t *start_offset)
+{
+       /*
+        * The first num_doorbells are used by amdgpu.
+        * amdkfd takes whatever's left in the aperture.
+        */
+       if (adev->doorbell.size > adev->doorbell.num_doorbells * sizeof(u32)) {
+               *aperture_base = adev->doorbell.base;
+               *aperture_size = adev->doorbell.size;
+               *start_offset = adev->doorbell.num_doorbells * sizeof(u32);
+       } else {
+               *aperture_base = 0;
+               *aperture_size = 0;
+               *start_offset = 0;
+       }
+}
+
 void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)
 {
        int i;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 2ff4194fd1533d48258a6381b4dfdd04ae04bfb1..ae9a3a0334d7bf56e90dc8d5c7ffb76e0461aa18 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -438,38 +438,7 @@ static void amdgpu_device_doorbell_fini(struct amdgpu_device *adev)
        adev->doorbell.ptr = NULL;
 }
 
-/**
- * amdgpu_doorbell_get_kfd_info - Report doorbell configuration required to
- *                                setup amdkfd
- *
- * @adev: amdgpu_device pointer
- * @aperture_base: output returning doorbell aperture base physical address
- * @aperture_size: output returning doorbell aperture size in bytes
- * @start_offset: output returning # of doorbell bytes reserved for amdgpu.
- *
- * amdgpu and amdkfd share the doorbell aperture. amdgpu sets it up,
- * takes doorbells required for its own rings and reports the setup to amdkfd.
- * amdgpu reserved doorbells are at the start of the doorbell aperture.
- */
-void amdgpu_doorbell_get_kfd_info(struct amdgpu_device *adev,
-                               phys_addr_t *aperture_base,
-                               size_t *aperture_size,
-                               size_t *start_offset)
-{
-       /*
-        * The first num_doorbells are used by amdgpu.
-        * amdkfd takes whatever's left in the aperture.
-        */
-       if (adev->doorbell.size > adev->doorbell.num_doorbells * sizeof(u32)) {
-               *aperture_base = adev->doorbell.base;
-               *aperture_size = adev->doorbell.size;
-               *start_offset = adev->doorbell.num_doorbells * sizeof(u32);
-       } else {
-               *aperture_base = 0;
-               *aperture_size = 0;
-               *start_offset = 0;
-       }
-}
+
 
 /*
  * amdgpu_device_wb_*()